Fix remaining specs

atom · Feb 28, 2018 · 089acd6 · 089acd6
1 parent 7b030cd
commit 089acd6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/directory-view.js b/lib/directory-view.js
@@ -116,22 +116,32 @@ class DirectoryView {
   createViewForEntry(entry) {
     const view = entry instanceof Directory ? new DirectoryView(entry) : new FileView(entry)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     const subscription = this.directory.onDidRemoveEntries(removedEntries => {
 =======
     this.subscriptions.add(this.directory.onDidRemoveEntries(removedEntries => {
 >>>>>>> Start to fix specs
+=======
+    const subscription = this.directory.onDidRemoveEntries(removedEntries => {
+>>>>>>> Fix remaining specs
       if (removedEntries.has(entry)) {
         view.element.remove()
         subscription.dispose()
       }
+<<<<<<< HEAD
 <<<<<<< HEAD
     })
 
     this.subscriptions.add(subscription)
 =======
     }))
 >>>>>>> Start to fix specs
+=======
+    })
+
+    this.subscriptions.add(subscription)
+>>>>>>> Fix remaining specs
 
     return view
   }