From: David Stainton <dstainton415@gmail.com>
Date: Mon, 26 Oct 2015 19:30:28 +0000 (+0100)
Subject: Fix indentation
X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/install.html?a=commitdiff_plain;h=fab22ecf320e85494ec4ccf16a87cab7b2fa05d7;p=tahoe-lafs%2Ftahoe-lafs.git

Fix indentation
---

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 = ...