Skip to content

Commit 94a0b6c

Browse files
committed
Merge branch 'dev' into pr3653
2 parents d35b409 + aba6345 commit 94a0b6c

File tree

7 files changed

+284
-55
lines changed

7 files changed

+284
-55
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ tests/core/pyspec/eth2spec/bellatrix/
2222
tests/core/pyspec/eth2spec/capella/
2323
tests/core/pyspec/eth2spec/deneb/
2424
tests/core/pyspec/eth2spec/electra/
25+
<<<<<<< HEAD
26+
=======
27+
tests/core/pyspec/eth2spec/eip7549/
28+
>>>>>>> dev
2529
tests/core/pyspec/eth2spec/whisk/
2630
tests/core/pyspec/eth2spec/eip7251/
2731
tests/core/pyspec/eth2spec/eip7594/

pysetup/spec_builders/eip7002.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)