One conflict was still hiding

multiview_platform/tests/test_utils/test_dataset.py

@@ -128,10 +128,9 @@ class Test_Dataset(unittest.TestCase):
                                                           "ViewN1": 1,
                                                           "ViewN2": 2,})
 
-<<<<<<< HEAD
-if __name__ == '__main__':
-    unittest.main()
-=======
+# <<<<<<< HEAD
+#
+# =======
     def test_get_label_names(self):
         dataset_object = dataset.Dataset(hdf5_file=self.dataset_file)
         raw_label_names = dataset_object.get_label_names(decode=False)
@@ -241,4 +240,6 @@ if __name__ == '__main__':
         os.remove(os.path.join(tmp_path, "test_noise.hdf5"))
 
 
->>>>>>> 66129965ae7c38b4bdb4ae657369ab24357070cd
+# >>>>>>> 66129965ae7c38b4bdb4ae657369ab24357070cd
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file