Conflicts resolved keeping both: Settings and SettingsState carry the sweep fields (miner-eff) and dev_fee / fee_total (dev-fee); the engine's settings snapshot sets both and the DevFeeState line stays. |
||
|---|---|---|
| .. | ||
| hive | ||
| mac | ||
| ota | ||
| windows | ||
| README-ship.md | ||
Conflicts resolved keeping both: Settings and SettingsState carry the sweep fields (miner-eff) and dev_fee / fee_total (dev-fee); the engine's settings snapshot sets both and the DevFeeState line stays. |
||
|---|---|---|
| .. | ||
| hive | ||
| mac | ||
| ota | ||
| windows | ||
| README-ship.md | ||