mirror of
https://github.com/ethereum/consensus-specs.git
synced 2026-01-31 22:37:54 -05:00
fix conflict
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -22,10 +22,6 @@ tests/core/pyspec/eth2spec/bellatrix/
|
||||
tests/core/pyspec/eth2spec/capella/
|
||||
tests/core/pyspec/eth2spec/deneb/
|
||||
tests/core/pyspec/eth2spec/electra/
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
tests/core/pyspec/eth2spec/eip7549/
|
||||
>>>>>>> dev
|
||||
tests/core/pyspec/eth2spec/whisk/
|
||||
tests/core/pyspec/eth2spec/eip7251/
|
||||
tests/core/pyspec/eth2spec/eip7594/
|
||||
|
||||
Reference in New Issue
Block a user