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

manual merge2

This commit is contained in:
Jonathan Warren 2013-07-23 17:05:42 -04:00
parent 1eab66690c
commit a76939114e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitmessageqt/__init__.py
View File

@ -30,12 +30,10 @@ import os
from pyelliptic.openssl import OpenSSL from pyelliptic.openssl import OpenSSL
import pickle import pickle
import platform import platform
<<<<<<< HEAD
import debug import debug
from debug import logger from debug import logger
=======
import subprocess import subprocess
>>>>>>> 2af86c8296e0c577f8ac48a56e9a3582ddd87473
try: try:
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui