From 345aaac349f6ea6bc4b9df838f1135df057c4925 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Jul 2016 09:30:51 +0000 Subject: [PATCH] update cs50 --- plugins/c9.ide.watcher/gui.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js index 011c7b4f..7249cee7 100644 --- a/plugins/c9.ide.watcher/gui.js +++ b/plugins/c9.ide.watcher/gui.js @@ -209,7 +209,8 @@ define(function(require, exports, module) { } function resolve() { - collab.send({type: "RESOLVE_CONFLICT", data: {docId: path}}); + if (collabEnabled && collab.send) + collab.send({type: "RESOLVE_CONFLICT", data: {docId: path}}); resolveConflict(doc, path); }