Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / server / api / v1 / workspace / index.js

diff --git a/server/api/v1/workspace/index.js b/server/api/v1/workspace/index.js
old mode 100644 (file)
new mode 100755 (executable)
index 261d45e..3208564
--- a/server/api/v1/workspace/index.js
+++ b/server/api/v1/workspace/index.js
@@ -10,7 +10,11 @@ router.get('/:fileId?', function(req, res) {
     var fileId = req.param('fileId');
     if(!fileId || fileId === '1f83f620-c1ed-11e5-9657-7942989daa00') {
         fileId === '1f83f620-c1ed-11e5-9657-7942989daa00';
+<<<<<<< HEAD
+    }
+=======
     } 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
     db.getFiles(fileId)
     .then(function(r) {
         var info = {