Start to fix specs

Author: Wliu

lib/directory-view.js

@@ -116,14 +116,22 @@ class DirectoryView {
   createViewForEntry(entry) {
     const view = entry instanceof Directory ? new DirectoryView(entry) : new FileView(entry)
 
+<<<<<<< HEAD
     const subscription = this.directory.onDidRemoveEntries(removedEntries => {
+=======
+    this.subscriptions.add(this.directory.onDidRemoveEntries(removedEntries => {
+>>>>>>> Start to fix specs
       if (removedEntries.has(entry)) {
         view.element.remove()
         subscription.dispose()
       }
+<<<<<<< HEAD
     })
 
     this.subscriptions.add(subscription)
+=======
+    }))
+>>>>>>> Start to fix specs
 
     return view
   }