Fix conflicts rebasing eip4844

This commit is contained in:
Emilia Hane
2023-02-06 14:36:38 +01:00
parent 7545ae9e9b
commit 5437dcae9c
6 changed files with 14 additions and 26 deletions

4
Cargo.lock generated
View File

@@ -6826,6 +6826,7 @@ dependencies = [
]
[[package]]
<<<<<<< HEAD
name = "serde-big-array"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6836,6 +6837,8 @@ dependencies = [
]
[[package]]
=======
>>>>>>> 5ef38b590 (Fix conflicts rebasing eip4844)
name = "serde_array_query"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -8343,7 +8346,6 @@ dependencies = [
"rusqlite",
"safe_arith",
"serde",
"serde-big-array",
"serde_derive",
"serde_json",
"serde_with",