From fab22ecf320e85494ec4ccf16a87cab7b2fa05d7 Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton415@gmail.com>
Date: Mon, 26 Oct 2015 20:30:28 +0100
Subject: [PATCH] Fix indentation
---
src/allmydata/frontends/magic_folder.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index e4baef54..de5c9b98 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -689,7 +689,7 @@ class Downloader(QueueMixin, WriteFileMixin):
print "metadata %r" % (metadata,)
print "<<<<--- if %r != %r" % (dmd_last_downloaded_uri, local_last_downloaded_uri)
if dmd_last_downloaded_uri is not None and dmd_last_downloaded_uri != local_last_downloaded_uri:
- is_conflict = True
+ is_conflict = True
#dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
#local_last_uploaded_uri = ...
--
2.45.2