From e7656ff476e9cffb0e95cd22e381f795c24c0c85 Mon Sep 17 00:00:00 2001
From: Neil Kindlon <nek3d@d-128-109-67.bootp.Virginia.EDU>
Date: Mon, 26 Jan 2015 17:05:57 -0500
Subject: [PATCH] yet another merge error

---
 test/closest/kclosest/test-kclosest.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/closest/kclosest/test-kclosest.sh b/test/closest/kclosest/test-kclosest.sh
index 4cf91eb7..10cf7f52 100644
--- a/test/closest/kclosest/test-kclosest.sh
+++ b/test/closest/kclosest/test-kclosest.sh
@@ -548,7 +548,6 @@ chr1	105	110	q2.2	20	-	2	chr1	30	40	3.2	20	+	-66" > exp
 $BT closest -a q2.bed -b d2.bed d3.bed -mdb all -k 10  -D ref -t last > obs
 check obs exp
 rm obs exp
-<<<<<<< HEAD
 
 ###########################################################
 # Test new -fu and -fd features
-- 
GitLab