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

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

diff --git a/server/api/v1/tagList/index.js b/server/api/v1/tagList/index.js
index 4f57fa5..7fe4838 100755 (executable)
--- a/server/api/v1/tagList/index.js
+++ b/server/api/v1/tagList/index.js
@@ -7,9 +7,14 @@ router.get('/', function(req, res) {
    var tagList = require(__dirname + '/../../../../user-specific-files/OptionControlFile/tag_list');
     var info = {
        status: 'success',
+<<<<<<< HEAD
        info: tagList
    };
    console.log('in router.get of tagList');
+=======
+       info: tagList 
+   };
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
    res.send(info);
 });