summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-20 11:30:32 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-20 11:30:32 -0300
commit1662a500c8367478cac54e71feae9c239cec4bd3 (patch)
tree97fc863c7c3f6e9e9d7a38f690802cfbc6d2a55f /src/leap/bitmask/gui
parentc2487b80fb33ba5a61edf9470075bdf130a003f0 (diff)
parent8702e7bb2fc92fd85b7b1409b40430d25524538e (diff)
Merge remote-tracking branch 'ivan/bug/update-failing-test-and-pep8' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index ef39181b..e84b7a7b 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1090,8 +1090,6 @@ class MainWindow(QtGui.QMainWindow):
#self._status_panel.set_eip_status(
# self.tr("MX is disabled"))
-
-
def _get_socket_host(self):
"""
Returns the socket and port to be used for VPN