resolve merge conflicts

ethereum · Aug 1, 2022 · cef5e0f · cef5e0f
2 parents 4bd2752 + 89bb3cd
commit cef5e0f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/staking_deposit/settings.py b/staking_deposit/settings.py
@@ -21,7 +21,7 @@ class BaseChainSetting(NamedTuple):
 MainnetSetting = BaseChainSetting(NETWORK_NAME=MAINNET, GENESIS_FORK_VERSION=bytes.fromhex('00000000'))
 # Ropsten setting
 RopstenSetting = BaseChainSetting(NETWORK_NAME=ROPSTEN, GENESIS_FORK_VERSION=bytes.fromhex('80000069'))
-# Goreli setting
+# Goerli setting
 GoerliSetting = BaseChainSetting(NETWORK_NAME=GOERLI, GENESIS_FORK_VERSION=bytes.fromhex('00001020'))
 # Merge Testnet (spec v1.1.9)
 KilnSetting = BaseChainSetting(NETWORK_NAME=KILN, GENESIS_FORK_VERSION=bytes.fromhex('70000069'))