From c82c61ef3da7a680ccff1157c3e30e001696745a Mon Sep 17 00:00:00 2001
From: shortcutme <hello@noloop.me>
Date: Fri, 11 Nov 2016 23:12:32 +0100
Subject: [PATCH] Rev1704, FIx siteSign error

---
 plugins/MergerSite/MergerSitePlugin.py | 2 ++
 src/Config.py                          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/MergerSite/MergerSitePlugin.py b/plugins/MergerSite/MergerSitePlugin.py
index ba018d86..80bff92f 100644
--- a/plugins/MergerSite/MergerSitePlugin.py
+++ b/plugins/MergerSite/MergerSitePlugin.py
@@ -287,6 +287,8 @@ class SiteManagerPlugin(object):
         merged_db = {}
         merged_to_merger = {}
         site_manager = self
+        if not self.sites:
+            return
         for site in self.sites.itervalues():
             # Update merged sites
             merged_type = site.content_manager.contents.get("content.json", {}).get("merged_type")
diff --git a/src/Config.py b/src/Config.py
index 252c3492..1c69591a 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.0"
-        self.rev = 1703
+        self.rev = 1704
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"