conflict

cosmos · Jan 7, 2025 · 915ca44 · 915ca44
1 parent fa7e136
commit 915ca44
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 572 deletions.
diff --git a/scripts/build/build.mk b/scripts/build/build.mk
@@ -13,11 +13,6 @@ HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
 DOCKER := $(shell which docker)
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 
-<<<<<<< HEAD
-rocksdb_version=v9.6.1
-
-=======
->>>>>>> b0031a103 (docs: remove RocksDB (#23212))
 ifeq ($(findstring .,$(VERSION)),)
 	VERSION := 0.0.0
 endif

diff --git a/server/v2/store/commands.go b/server/v2/store/commands.go