Resolve conflicts after mergify

Kava-Labs · Sep 7, 2023 · 4e27c67 · 4e27c67
1 parent 7cc05e1
commit 4e27c67
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/cmd/kava/cmd/root.go b/cmd/kava/cmd/root.go
@@ -23,11 +23,8 @@ import (
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/app/params"
 	kavaclient "github.com/kava-labs/kava/client"
-<<<<<<< HEAD
-	"github.com/kava-labs/kava/migrate"
-=======
 	"github.com/kava-labs/kava/cmd/kava/opendb"
->>>>>>> 90fbe1aa (Make rocksdb configurable (#1658))
+	"github.com/kava-labs/kava/migrate"
 )
 
 // EnvPrefix is the prefix environment variables must have to configure the app.