Add err print statement to show the conflict...
authorDavid Stainton <dstainton415@gmail.com>
Wed, 26 Aug 2015 15:50:03 +0000 (17:50 +0200)
committerDaira Hopwood <daira@jacaranda.org>
Thu, 1 Oct 2015 00:19:47 +0000 (01:19 +0100)
commitd1312282c2a07ba8e77ce963a4322ac6225a3283
tree669b64dd87761e74727ecddb3fc7d7a9f624050f
parentc8b138d6e6b770f3b5f8edc20cd5c72c612d02e5
Add err print statement to show the conflict...
src/allmydata/frontends/magic_folder.py
src/allmydata/util/fileutil.py