Simon Frei bc53782f88 test: Update conflict integration test (ref #5511) (#5618) ...

The change in 225c0dda80 (#5511) results in
conflicts being immediately scanned and synced, while the test expects just one
conflict on either side. Change it to expect the same conflict on both sides.

2019-03-25 12:53:06 +01:00

11 KiB

Raw Blame History

View Raw