From b5f23212371b09411f8347997cd27c84bb482142 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Thu, 10 Oct 2019 09:49:05 -0400
Subject: [PATCH] One conflict was still hiding
---
multiview_platform/tests/test_utils/test_dataset.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/multiview_platform/tests/test_utils/test_dataset.py b/multiview_platform/tests/test_utils/test_dataset.py
index 3c5c1c22..c228d76b 100644
--- a/multiview_platform/tests/test_utils/test_dataset.py
+++ b/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
--
GitLab