fix: merge conflict

celestiaorg · Oct 31, 2023 · fb5a3a8 · fb5a3a8
1 parent 2b7a32e
commit fb5a3a8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/cmd/celestia-appd/cmd/root.go b/cmd/celestia-appd/cmd/root.go
@@ -128,11 +128,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig encoding.Config) {
 		debugCmd,
 		config.Cmd(),
 		commands.CompactGoLevelDBCmd,
-<<<<<<< HEAD
-=======
-		addrbookCommand(),
 		downloadGenesisCommand(),
->>>>>>> c34a93d (feat: `download-genesis` command (#2791))
 	)
 
 	server.AddCommands(rootCmd, app.DefaultNodeHome, NewAppServer, createAppAndExport, addModuleInitFlags)