resolve merge conflict

dydxprotocol · Oct 20, 2023 · 3941a5e · 3941a5e
1 parent af60bcf
commit 3941a5e
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/protocol/testing/testnet-external/pregenesis.sh b/protocol/testing/testnet-external/pregenesis.sh
@@ -163,14 +163,7 @@ function overwrite_genesis_public_testnet() {
 	dasel put -t string -f "$GENESIS" '.app_state.gov.params.quorum' -v '0.33400' # 33.4%
 	dasel put -t string -f "$GENESIS" '.app_state.gov.params.threshold' -v '0.50000' # 50%
 	dasel put -t string -f "$GENESIS" '.app_state.gov.params.veto_threshold' -v '0.33400' # 33.4%
-<<<<<<< HEAD
-
-	# Consensus params
-	dasel put -t string -f "$GENESIS" '.consensus_params.block.max_bytes' -v '22020096'
-	dasel put -t string -f "$GENESIS" '.consensus_params.block.max_gas' -v '-1'
-=======
 	dasel put -t string -f "$GENESIS" '.app_state.gov.params.min_initial_deposit_ratio' -v '0.20000' # 20%
->>>>>>> 98464cbb ([DEC-2155] Set `gov.params.min_initial_deposit_ratio` to 0.2 to avoid spamming (#670))
 }
 
 create_pregenesis_file() {