actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)

1 files changed, 0 insertions, 27 deletions

diff --git a/src/leap/util/test_leap_argparse.py b/src/leap/util/test_leap_argparse.py
deleted file mode 100644
index 1442e827..00000000
--- a/src/leap/util/test_leap_argparse.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from argparse import Namespace
-import unittest
-
-from leap.util import leap_argparse
-
-
-class LeapArgParseTest(unittest.TestCase):
-    """
-    Test argparse options for eip client
-    """
-
-    def setUp(self):
-        """
-        get the parser
-        """
-        self.parser = leap_argparse.build_parser()
-
-    def test_debug_mode(self):
-        """
-        test debug mode option
-        """
-        opts = self.parser.parse_args(
-            ['--debug'])
-        self.assertEqual(
-            opts,
-            Namespace(config_file=None,
-                      debug=True))