From e9a86d802e81f86bfac317986ab77c0334a2e6f0 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 18 May 2016 01:16:18 +0000
Subject: [PATCH] Fixed bug with change icon not showing when the version in
 the IDE is different from on disk

---
 package.json                  | 2 +-
 plugins/c9.ide.watcher/gui.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index aa1a8fc7..8b3c9c36 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#8c4a6d0137",
+        "c9.ide.collab": "#2d22e02512",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index 54e577a9..ad2f61af 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -294,7 +294,7 @@ define(function(require, exports, module) {
         function automerge(tab, data) {
             if (!settings.getBool("user/general/@automerge"))
                 return false;
-                
+            console.log("Automerging old and new contents");
             return merge(tab, data);
         }