From 8cc527b69665a2b243d8fbadd9be6789b8f4c8c8 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Thu, 10 Oct 2019 10:27:19 -0400
Subject: [PATCH] Revmoved commentaries
---
multiview_platform/tests/test_utils/test_dataset.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/multiview_platform/tests/test_utils/test_dataset.py b/multiview_platform/tests/test_utils/test_dataset.py
index c228d76b..381dca70 100644
--- a/multiview_platform/tests/test_utils/test_dataset.py
+++ b/multiview_platform/tests/test_utils/test_dataset.py
@@ -128,9 +128,6 @@ class Test_Dataset(unittest.TestCase):
"ViewN1": 1,
"ViewN2": 2,})
-# <<<<<<< 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)
@@ -240,6 +237,5 @@ class Test_Dataset(unittest.TestCase):
os.remove(os.path.join(tmp_path, "test_noise.hdf5"))
-# >>>>>>> 66129965ae7c38b4bdb4ae657369ab24357070cd
if __name__ == '__main__':
unittest.main()
\ No newline at end of file
--
GitLab