Merge remote-tracking branch 'origin/develop' into develop

Louiss5 · Sep 23, 2016 · 9f4b60c · 9f4b60c
2 parents 5d7a428 + ba13ab8
commit 9f4b60c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 node_modules
 *.idea
 
+conf.json
+
 npm-debug.log
 coverage
diff --git a/conf.json b/conf.json
@@ -70,6 +70,6 @@
     "APP_LOG_HOST": "slnxmeandev06.ptx.fr.sopra",
     "APP_PROBE_HOST": "slnxmeandev06.ptx.fr.sopra",
     "APP_LOGCORE_LVL": "debug",
-    "PORT": "3062"
+    "PORT": "3022"
   }
 }