mirror of
https://github.com/status-im/eth2.0-specs.git
synced 2025-02-09 01:04:14 +00:00
fix conflict
This commit is contained in:
parent
94a0b6c581
commit
9edfb29e2c
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/
|
||||
|
Loading…
x
Reference in New Issue
Block a user