Jordan 02437a8c72 feat: add cost for the merge when using plot auto-merge (#3841) ... * feat: add cost for the merge when using plot auto-merge - Closes #3814 * fix: Don't charge for auto merge if there is no auto merge --------- Co-authored-by: Alexander Brandes <mc.cache@web.de>		2023-05-21 17:57:46 +02:00
..
src	feat: add cost for the merge when using plot auto-merge (#3841)	2023-05-21 17:57:46 +02:00
build.gradle.kts	Reapply stash	2023-03-15 10:30:38 +01:00