conflict fixed

2018-05-11 12:39:54 +02:00
parent 9ae6f72681 8e489a70b1
commit d34448fcce
6 changed files with 13 additions and 53 deletions
--- a/homepage.conf
+++ b/homepage.conf
@ -1,4 +1,3 @@
 {
-    "httpPort": 4200,
-    "masterTmpl": "./docroot/master.tmpl"
+    "httpPort": 4200
 }