From 6b3ea883a62d40f8e2d68ce95bbefa2ac64b95de Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Thu, 23 Feb 2017 01:37:47 +0100 Subject: [bug] fix bad merge --- src/leap/bitmask/cli/bitmask_cli.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/leap/bitmask/cli') diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index 0c037b25..65993ae8 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) -- cgit v1.2.3