From ea54f8e77961b9f01333cfc0fe33bc115db878a2 Mon Sep 17 00:00:00 2001
From: Jonathan Warren <me@jonwarren.org>
Date: Sun, 25 Aug 2013 16:23:28 -0400
Subject: [PATCH] resolve merge conflict

---
 src/bitmessagemain.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index da4e0297..494814d3 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -38,21 +38,17 @@ from class_singleWorker import *
 from class_outgoingSynSender import *
 from class_singleListener import *
 from class_addressGenerator import *
+from debug import logger
 
 # Helper Functions
 import helper_bootstrap
 
-<<<<<<< HEAD
-=======
-from debug import logger
-
 import sys
 if sys.platform == 'darwin':
     if float("{1}.{2}".format(*sys.version_info)) < 7.5:
         logger.critical("You should use python 2.7.5 or greater. Your version: %s", "{0}.{1}.{2}".format(*sys.version_info))
         sys.exit(0)
 
->>>>>>> 53ca5b03ffb6b35ac03588107dc4a1d5cde7aad4
 def connectToStream(streamNumber):
     selfInitiatedConnections[streamNumber] = {}
     if sys.platform[0:3] == 'win':