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>
Fri, 5 Feb 2016 21:59:38 +0000 (21:59 +0000)
commit13020b99377e622699b659f885fd6db03d0c973b
treef85a3616ba9037223d8d399a68a94a46d71de0b1
parentd63e13052e8453403d11614b94b28c62f26ed8c7
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