From 809393434b974010daa5d46f03238bd83cd06f34 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@c9.io>
Date: Wed, 10 Jun 2015 14:24:08 +0000
Subject: [PATCH] Resolve has knowledge of it's own path already :)

---
 plugins/c9.ide.watcher/gui.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index abe09de6..bf5717fe 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -186,11 +186,11 @@ define(function(require, exports, module) {
                 return;
             }
             
-            function resolve(path) {
+            function resolve() {
                 console.log("[watchers] resolved change event without dialog", path);
                 doc.tab.classList.remove("conflict");
                 delete doc.meta.$merge;
-                delete changedPaths[path];
+                delete changedPaths[this.tab.path];
             }
 
             var doc = tab.document;
@@ -340,12 +340,12 @@ define(function(require, exports, module) {
             var doc = tab.document;
             doc.setBookmarkedValue(data, true);
             doc.meta.timestamp = Date.now() - settings.timeOffset;
-            changedPaths[path].resolve(path);
+            changedPaths[path].resolve();
         }
         
         function mergeChangedPath(err, path, data) {
             merge(changedPaths[path].tab, data);
-            changedPaths[path].resolve(path);
+            changedPaths[path].resolve();
         }
         
         function showChangeDialog(tab, data) {
@@ -368,12 +368,12 @@ define(function(require, exports, module) {
                 if (all) {
                     for (var id in changedPaths) {
                         changedPaths[id].tab.document.undoManager.bookmark(-2);
-                        changedPaths[id].resolve(id);
+                        changedPaths[id].resolve();
                     }
                 }
                 else {
                     changedPaths[path].tab.document.undoManager.bookmark(-2);
-                    changedPaths[path].resolve(path);
+                    changedPaths[path].resolve();
                 }
                 checkEmptyQueue();
             }