forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

resolve merge conflicts

Browse source
This commit is contained in:
Arpit Temani 2022-11-29 13:03:49 +05:30
parent 4b6115d9bb
commit 59dccd37c3
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/cli/server/config.go
View file

@ -435,11 +435,7 @@ func DefaultConfig() *Config {
NoLocals: false,
Journal: "transactions.rlp",
Rejournal: 1 * time.Hour,
<<<<<<< HEAD
PriceLimit: 1,
=======
PriceLimit: 1, // geth's default
>>>>>>> 3e7160997a79c890b1f271b2e1c03a0c2eeeb303
PriceBump: 10,
AccountSlots: 16,
GlobalSlots: 32768,