fix conflict

This commit is contained in:
Hsiao-Wei Wang 2024-04-09 14:13:44 +08:00 committed by GitHub
parent 94a0b6c581
commit 9edfb29e2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

4
.gitignore vendored
View File

@ -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/