conflicts: Fix ResolveConflicts test breaking linter
One of the tests for ResolveConflicts violates a linter rule because
it's using foo += 1
instead of foo++
. Fix this by using the latter
style.
Edited by Patrick Steinhardt
One of the tests for ResolveConflicts violates a linter rule because
it's using foo += 1
instead of foo++
. Fix this by using the latter
style.