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

[eos/zephyr.git] / server / config.js

diff --git a/server/config.js b/server/config.js
old mode 100644 (file)
new mode 100755 (executable)
index 7368226..8fde66a
--- a/server/config.js
+++ b/server/config.js
@@ -3,7 +3,11 @@
 var path = require('path');
 
 module.exports = {
+<<<<<<< HEAD
+    ip  : "127.0.0.1",
+=======
    ip  : "127.0.0.1",
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
    port: "3000",
    root: path.normalize(__dirname +'/../front-end/dist/')
 };