Detect remote conflict by checking for pending upload.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 3 Nov 2015 22:23:14 +0000 (22:23 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 3 Nov 2015 22:23:14 +0000 (22:23 +0000)
commitdadde12eb78aedf01cc1db04ef2902abad962219
treec6ec72b595e3d833e36d65237ff294a66fb9e2e7
parentcb180192c18839fc2628fb73fafcdb36be2496f9
Detect remote conflict by checking for pending upload.

Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py