summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-23 01:37:47 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 01:37:47 +0100
commit6b3ea883a62d40f8e2d68ce95bbefa2ac64b95de (patch)
treea16530fa64b5abaf92708c554fdbefa01c282586 /src/leap/bitmask
parenta053c81939792582636a131c7640cf954b7638fd (diff)
[bug] fix bad merge
Diffstat (limited to 'src/leap/bitmask')
-rwxr-xr-xsrc/leap/bitmask/cli/bitmask_cli.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py
index 0c037b2..65993ae 100755
--- a/src/leap/bitmask/cli/bitmask_cli.py
+++ b/src/leap/bitmask/cli/bitmask_cli.py
@@ -74,15 +74,9 @@ OPTIONAL ARGUMENTS:
mail = Mail(self.cfg, self.print_json)
return mail.execute(raw_args)
-<<<<<<< HEAD
- def eip(self, raw_args):
- eip = Eip(self.cfg, self.print_json)
- return eip.execute(raw_args)
-=======
def vpn(self, raw_args):
vpn = VPN()
return vpn.execute(raw_args)
->>>>>>> [refactor] rename eip to vpn
def keys(self, raw_args):
keys = Keys(self.cfg, self.print_json)