Fix merge conflict

This commit is contained in:
inphi 2022-11-11 17:52:57 -05:00
parent 3df1371897
commit 37144460be
No known key found for this signature in database
GPG Key ID: B61066A1A33F5D24

View File

@ -5,7 +5,7 @@ from .constants import (
def is_post_fork(a, b):
if a == EIP4844:
return b in [PHASE0, ALTAIR, BELLATRIX, EIP4844]
return b in [PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844]
if a == CAPELLA:
return b in [PHASE0, ALTAIR, BELLATRIX, CAPELLA]
if a == BELLATRIX: