Simon Frei bc53782f88 test: Update conflict integration test (ref #5511) (#5618)
The change in 225c0dda805fbed69d745abce935130dcaf68763 (#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
..
2015-01-22 00:18:08 +00:00
2017-11-13 00:25:07 +01:00
2019-02-02 12:16:27 +01:00