From: David Stainton Date: Mon, 26 Oct 2015 17:57:46 +0000 (+0100) Subject: import ConflictError X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/provisioning?a=commitdiff_plain;h=d0de6d5144a6733d2b970b595c7f67575e7bcac7;p=tahoe-lafs%2Ftahoe-lafs.git import ConflictError --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index e1df0a64..7ae36b17 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -13,7 +13,7 @@ from twisted.application import service from allmydata.util import fileutil from allmydata.interfaces import IDirectoryNode from allmydata.util import log -from allmydata.util.fileutil import precondition_abspath, get_pathinfo +from allmydata.util.fileutil import precondition_abspath, get_pathinfo, ConflictError from allmydata.util.assertutil import precondition from allmydata.util.deferredutil import HookMixin from allmydata.util.encodingutil import listdir_filepath, to_filepath, \