Fix that

services/bentobox/flags.go

@@ -1,10 +1,7 @@
 package main
 
-<<<<<<< HEAD
 import "flag"
 
-=======
->>>>>>> 4e7b29452aa525fa2fe68f9b6e8608845b5baaf7
 // Config has all the options you defined at the command line.
 type Config struct {
 	Debug bool
@@ -15,7 +12,6 @@ type Config struct {
 func ParseFlags() *Config {
 	cfg := &Config{}
 
-<<<<<<< HEAD
 	optionsDBUser := flag.String("dbuser", "postgres", "database username")
 	optionsDBPassword := flag.String("dbpassword", "mysecretpassword", "database password")
 	optionsDBName := flag.String("dbname", "bentobox", "database name")
@@ -25,7 +21,5 @@ func ParseFlags() *Config {
 	//	"Maximum of concurrent queries to the RPC Node")
 	// optionsLoopTimeMs := flag.Int("looptimems", 5000, "Iteration interval for block querying")
 
-=======
->>>>>>> 4e7b29452aa525fa2fe68f9b6e8608845b5baaf7
 	return cfg
 }

services/bentobox/main.go

@@ -1,6 +1,5 @@
 package main
 
-<<<<<<< HEAD
 import "fmt"
 
 func main() {
@@ -19,9 +18,4 @@ func main() {
 	// PLACEHOLDER
 	fmt.Printf("OK")
 	// PLACEHOLDER
-=======
-func main() {
-	// get the flags
-	cfg := ParseFlags()
->>>>>>> 4e7b29452aa525fa2fe68f9b6e8608845b5baaf7
 }