resolve merge conflicts, move redb to v2.0

sigp · Mar 29, 2024 · de444ee · de444ee
1 parent 304aed9
commit de444ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml
@@ -16,7 +16,7 @@ beacon_chain = { workspace = true }
 [dependencies]
 db-key = "0.0.5"
 leveldb = { version = "0.8.6", optional = true }
-redb = {  git = "https://github.com/cberner/redb", branch = "master", optional = true }
+redb = { version = "2.0", optional = true }
 parking_lot = { workspace = true }
 itertools = { workspace = true }
 ethereum_ssz = { workspace = true }