d

taskexecutor/app/config/settings.js

@@ -7,13 +7,8 @@ var ENVINPUT={
   REDIS_HOST:process.env.REDIS_HOST,
   REDIS_PORT:process.env.REDIS_PORT,
   REDIS_PWD:process.env.REDIS_PWD,
-<<<<<<< HEAD
   REDIS_DB:process.env.TASK_REDIS_DB,
   DB_NAME:process.env.TASK_DB_NAME,
-=======
-  DB_NAME:process.env.TASK_DB_NAME,
-  REDIS_DB:process.env.TASK_REDIS_DB,
->>>>>>> 1bccc0e0e608e84ed0a0ddd5bc63e6a076047c01
   APP_ENV:process.env.APP_ENV?process.env.APP_ENV:"dev"
 };
 var settings = {