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

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

diff --git a/server/app.js b/server/app.js
index 9fb5610..7f7692b 100755 (executable)
--- a/server/app.js
+++ b/server/app.js
@@ -17,9 +17,16 @@ require('./routes')(app);
 // DBのコンストラクタを実行
 var DB = require('./class/DB').instance;
 DB.init()
+<<<<<<< HEAD
 //.then(function() {
 //    return DB.test2();
 //})
+=======
+/*
+.then(function() {
+    return DB.test2();
+})*/
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 .then(function() {
     if(process.env.NODE_ENV === 'debug') {
         return DB.testRest();
@@ -27,6 +34,7 @@ DB.init()
 })
 .then(function() {
     var server = app.listen(config.port, config.ip, function () {
+<<<<<<< HEAD
       /*
       switch (req.method) {
         case 'GET':
@@ -37,6 +45,8 @@ DB.init()
         break;
       }
       */
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         console.log('Zephyr listening at http://%s:%s', config.ip, config.port);
         console.log('NODE_ENV = ' + app.get('env'))
     });