chore: fix bad rebase

Author: jedwards1211

index.js

@@ -46,7 +46,7 @@ function launch(ops) {
   const deleteRequireCache = {
     [initial]: false,
   }
-  options.deleteRequireCache.forEach((m) => (deleteRequireCache[m] = true))
+  options.deleteRequireCache.forEach(m => (deleteRequireCache[m] = true))
   process.on('exit', () => child && child.kill())
 
   function done(codeOrError, signal) {
@@ -85,35 +85,10 @@ function launch(ops) {
       interval: options.interval || 100,
       binaryInterval: options.binaryInterval || 300,
     })
-<<<<<<< HEAD
-    watcher.on('change', function (file) {
-      if (deleteRequireCache[file]) {
-        console.log(
-          chalk.bold.red('[smart-restart]'),
-          'File',
-          path.relative(process.cwd(), file),
-          'has changed, clearing require cache.'
-        )
-        for (let key in deleteRequireCache) {
-          if (deleteRequireCache[key]) {
-            delete require.cache[key]
-          }
-        }
-        return
-      }
-      console.log(
-        chalk.bold.red('[smart-restart]'),
-        'File',
-        path.relative(process.cwd(), file),
-        'has changed, reloading.'
-      )
-      restart()
-=======
     watcher.on('change', function(file) {
       log('File', path.relative(process.cwd(), file), 'has changed')
       if (deleteRequireCache[file]) clearRequireCacheSoon()
       else restartSoon()
->>>>>>> 962352e (fix: multiple issues)
     })
 
     const args = [
@@ -136,7 +111,7 @@ function launch(ops) {
     child.on('error', done)
 
     debug('spawned child pid: ', child.pid)
-    child.on('message', (message) => {
+    child.on('message', message => {
       debug('message received')
       const { status, file, parent, err, exit } = message
       if (exit != null) {
@@ -145,7 +120,7 @@ function launch(ops) {
       }
       if (status === 'ready') {
         debug('sending message:', options)
-        child.send(options, (error) => {
+        child.send(options, error => {
           if (error) debug(error.stack)
         })
         return