diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/leap/bitmask/cli/bitmask_cli.py | 6 |
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) |