Add file conflict unit test
authorDavid Stainton <dstainton415@gmail.com>
Tue, 27 Oct 2015 09:59:29 +0000 (10:59 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 27 Oct 2015 18:44:55 +0000 (18:44 +0000)
commita1367f644748f18460757f6d2e4136081ea14aef
tree13537679f84ca106de4624250c1956ed00f2df60
parent976ea1586348e590c19287a2a47964403366056a
Add file conflict unit test
src/allmydata/test/test_magic_folder.py