Added tests #7

BuysDB · May 24, 2019 · 0a77ac7 · 0a77ac7
1 parent 91ab88e
commit 0a77ac7
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/tests/test_barcodeFileParser.py b/tests/test_barcodeFileParser.py
@@ -5,13 +5,11 @@
 
 import singlecellmultiomics.barcodeFileParser.barcodeFileParser as barcodeFileParser
 
-<<<<<<< HEAD
+
 """
 These tests check if the barcode file parser is working correctly
-
 """
-=======
->>>>>>> 9e4982e0d64ff8f0edabeca7668328c6874417fa
+
 class TestBarcodeParser(unittest.TestCase):
 
     def test_insert(self):