Fix test: previously we accounted for the propagation of the conflict
authorDavid Stainton <dstainton415@gmail.com>
Tue, 3 Nov 2015 19:29:51 +0000 (20:29 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 3 Nov 2015 22:26:07 +0000 (22:26 +0000)
commitaa54712094a0a4b4e54801792b90f80c516095e1
tree3817706dd8d09921af7efd7d92deab762f77de72
parente1f21dd123bfe2dab7ebd05a25f2812ce32c9c92
Fix test: previously we accounted for the propagation of the conflict
because alice scaned her own dmd... whereas now she does not.
src/allmydata/test/test_magic_folder.py