citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Jonathan Warren 2013-08-25 16:23:28 -04:00
parent 2614975163
commit ea54f8e779
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bitmessagemain.py
View File

@ -38,21 +38,17 @@ from class_singleWorker import *
from class_outgoingSynSender import * from class_outgoingSynSender import *
from class_singleListener import * from class_singleListener import *
from class_addressGenerator import * from class_addressGenerator import *
from debug import logger
# Helper Functions # Helper Functions
import helper_bootstrap import helper_bootstrap
<<<<<<< HEAD
=======
from debug import logger
import sys import sys
if sys.platform == 'darwin': if sys.platform == 'darwin':
if float("{1}.{2}".format(*sys.version_info)) < 7.5: 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)) logger.critical("You should use python 2.7.5 or greater. Your version: %s", "{0}.{1}.{2}".format(*sys.version_info))
sys.exit(0) sys.exit(0)
>>>>>>> 53ca5b03ffb6b35ac03588107dc4a1d5cde7aad4
def connectToStream(streamNumber): def connectToStream(streamNumber):
selfInitiatedConnections[streamNumber] = {} selfInitiatedConnections[streamNumber] = {}
if sys.platform[0:3] == 'win': if sys.platform[0:3] == 'win':