修改冲突

6 years ago · bf076dd7b0
parent f4985690c1
commit bf076dd7b0
2 changed files with 2 additions and 2 deletions
--- a/bin/node/server.go
+++ b/bin/node/server.go
@ -18,7 +18,7 @@ import (

 var (
 	level    = flag.Int("l", 0, "log level, -1:debug, 0:info, 1:warn, 2:error")
-	confFile = flag.String("conf", "/conf/files/base.json", "config file path")
+	confFile = flag.String("conf", "conf/files/base.json", "config file path")
 )

 func main() {
--- a/bin/web/server.go
+++ b/bin/web/server.go
@ -19,7 +19,7 @@ import (

 var (
 	level    = flag.Int("l", 0, "log level, -1:debug, 0:info, 1:warn, 2:error")
-	confFile = flag.String("conf", "/conf/files/base.json", "config file path")
+	confFile = flag.String("conf", "conf/files/base.json", "config file path")
 	network  = flag.String("network", "", "network protocol of listen address: ipv4/ipv6, or empty use both")
 )