minor changes

maticnetwork · Jan 24, 2022 · e5d5802 · e5d5802
1 parent 560ad7d
commit e5d5802
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 156 deletions.
diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json
@@ -15,12 +15,6 @@
  "londonBlock": 23850000,
  "bor": {
  "jaipurBlock": 23850000,
-<<<<<<< HEAD
- "period": 2,
- "producerDelay": 6,
- "sprint": 64,
- "backupMultiplier": 2,
-=======
  "period": {
  "0": 2
  },
@@ -29,7 +23,6 @@
  "backupMultiplier": {
  "0": 2
  },
->>>>>>> 2d84249492818622540ddf5136234fa734e5950a
  "validatorContract": "0x0000000000000000000000000000000000001000",
  "stateReceiverContract": "0x0000000000000000000000000000000000001001",
  "overrideStateSyncRecords": {

diff --git a/command/server/chains/mainnet.go b/command/server/chains/mainnet.go