summaryrefslogtreecommitdiff
path: root/src/leap/baseapp/mainwindow.py
diff options
context:
space:
mode:
authorantialias <antialias@leap.se>2012-08-21 10:27:43 -0700
committerantialias <antialias@leap.se>2012-08-21 10:27:43 -0700
commitaf33eaa36c3b799a14a56b7845db3833ed52b97d (patch)
tree62773680916041a28abf30ec639879c98223173b /src/leap/baseapp/mainwindow.py
parentac00ec313a142e910447857c0e46e6d36c7f2ab2 (diff)
parent560232609ef229d46932f8ffcd66b8e114e8b3e6 (diff)
Merge branch 'refactor' into json-config
Diffstat (limited to 'src/leap/baseapp/mainwindow.py')
-rw-r--r--src/leap/baseapp/mainwindow.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index c5bdd8e9..bc844437 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -13,9 +13,6 @@ from PyQt4.QtCore import (pyqtSlot, pyqtSignal, QTimer)
from leap.baseapp.dialogs import ErrorDialog
-#from leap.eip.conductor import (EIPConductor,
- #EIPNoCommandError)
-#from leap.eip.config import (EIPInitBadKeyFilePermError)
from leap.eip import exceptions as eip_exceptions
from leap.eip.eipconnection import EIPConnection