Skip to content

conflicts: Fix ResolveConflicts test breaking linter

Patrick Steinhardt requested to merge pks-resolve-conflicts-test-style into master

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

Merge request reports