update fee

terra-money · Jul 14, 2022 · 4df88cb · 4df88cb
1 parent 51d2c25
commit 4df88cb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/faucet.go b/faucet.go
@@ -278,11 +278,7 @@ func checkAndUpdateLimit(db *leveldb.DB, account []byte, denom string) error {
 func drip(encodedAddress string, denom string, amount int64, isDetectMismatch bool) string {
 	builder := app.MakeEncodingConfig().TxConfig.NewTxBuilder()
 
-<<<<<<< HEAD
-	builder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(app.BondDenom, sdk.NewInt(200_000))))
-=======
 	builder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(app.BondDenom, sdk.NewInt(1_000_000))))
->>>>>>> v2
 	builder.SetGasLimit(150_000)
 	builder.SetMemo("faucet")
 	builder.SetTimeoutHeight(0)