manual merge2

2013-07-23 17:05:42 -04:00 · 2013-07-23 17:05:42 -04:00 · a76939114e
commit a76939114e
parent 1eab66690c
1 changed files with 1 additions and 3 deletions
--- a/src/bitmessageqt/init.py
+++ b/src/bitmessageqt/init.py
@ -30,12 +30,10 @@ import os
 from pyelliptic.openssl import OpenSSL
 import pickle
 import platform
-<<<<<<< HEAD
 import debug
 from debug import logger
-=======
 import subprocess
->>>>>>> 2af86c8296e0c577f8ac48a56e9a3582ddd87473
+

 try:
    from PyQt4 import QtCore, QtGui