mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 11:41:51 +00:00
Fix conflicts rebasing eip4844
This commit is contained in:
4
Cargo.lock
generated
4
Cargo.lock
generated
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user