From b4a656897116493943c5d2600d330e66b780a0e1 Mon Sep 17 00:00:00 2001
From: Venkat Malladi <venkat.malladi@utsouthwestern.edu>
Date: Tue, 8 Jan 2019 09:28:37 -0600
Subject: [PATCH] Remove head.
---
workflow/tests/test_xcor.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/workflow/tests/test_xcor.py b/workflow/tests/test_xcor.py
index e00f4f4..69006a0 100644
--- a/workflow/tests/test_xcor.py
+++ b/workflow/tests/test_xcor.py
@@ -9,7 +9,6 @@ test_output_path = os.path.dirname(os.path.abspath(__file__)) + \
@pytest.mark.singleend
-<<<<<<< HEAD
def test_cross_singleend():
assert os.path.exists(os.path.join(test_output_path, 'ENCFF833BLU.cc.plot.pdf'))
qc_file = os.path.join(test_output_path,"ENCFF833BLU.cc.qc")
--
GitLab