Resolved conflicts

multiview_platform/tests/test_ExecClassif.py

@@ -232,16 +232,9 @@ class Test_execBenchmark(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         rm_tmp()
-<<<<<<< HEAD
-        os.mkdir("./tests/tmp_tests")
-        cls.Dataset = h5py.File(
-            tmp_path+"test_file.hdf5", "w")
-        cls.labels = cls.Dataset.create_dataset("Labels",
-                                                data=np.array([0, 1, 2]))
-=======
+
         os.mkdir(tmp_path)
         cls.Dataset = test_dataset
->>>>>>> 66129965ae7c38b4bdb4ae657369ab24357070cd
         cls.argument_dictionaries = [{"a": 4, "args": {}}]
         cls.args = {
             "Base":{"name": "chicken_is_heaven", "type": "type", "pathf": "pathF"},