From a76939114ecf167ccefd6c5f5da3e4000c0e5d9e Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 23 Jul 2013 17:05:42 -0400 Subject: [PATCH] manual merge2 --- src/bitmessageqt/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 405ea1f8..3ee43370 100644 --- 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