fix: incorrect merge conflict resolutions

ChainSafe · Jan 16, 2025 · e253d0c · e253d0c
1 parent a8560e2
commit e253d0c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/cli/src/config/beaconParams.ts b/packages/cli/src/config/beaconParams.ts
@@ -50,8 +50,9 @@ export function getBeaconParamsFromArgs(args: GlobalArgs): ChainConfig {
   });
 
   // Temp
-  beaconParams["PEERDAS_FORK_EPOCH"] = beaconParams["EIP7594_FORK_EPOCH"];
-  beaconParams["PEERDAS_FORK_VERSION"] = beaconParams["EIP7594_FORK_VERSION"];
+  // TODO-das @matthewkeil what was this "temp" here for?
+  // beaconParams["PEERDAS_FORK_EPOCH"] = beaconParams["EIP7594_FORK_EPOCH"];
+  // beaconParams["PEERDAS_FORK_VERSION"] = beaconParams["EIP7594_FORK_VERSION"];
 
   if (args.supernode) {
     beaconParams["NODE_CUSTODY_REQUIREMENT"] = DATA_COLUMN_SIDECAR_SUBNET_COUNT;