LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

update cs50

Browse Source
This commit is contained in:
nightwing 2016-07-25 09:30:51 +00:00
parent 54cf12b10d
commit 345aaac349
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/c9.ide.watcher/gui.js
View File

@ -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);
}