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, 26 deletions

diff --git a/src/leap/gui/test_mainwindow_rc.py b/src/leap/gui/test_mainwindow_rc.py
deleted file mode 100644
index fd02704e..00000000
--- a/src/leap/gui/test_mainwindow_rc.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import unittest
-import hashlib
-
-import sip
-sip.setapi('QVariant', 2)
-
-from leap.gui import mainwindow_rc
-
-# I have to admit that there's something
-# perverse in testing this.
-# But I thought that it could be a good idea
-# to put a check to avoid non-updated resources files.
-
-# so, if you came here because an updated resource
-# did break a test, what you have to do is getting
-# the md5 hash of your qt_resource_data and change it here.
-
-# annoying? yep. try making a script for that :P
-
-
-class MainWindowResourcesTest(unittest.TestCase):
-
-    def test_mainwindow_resources_hash(self):
-        self.assertEqual(
-            hashlib.md5(mainwindow_rc.qt_resource_data).hexdigest(),
-            '5cc26322f96fabaa05c404f22774c716')