[bwa/el5/master] fix merge problem

[verdurin]

commit 6adc5512a35c980f7b164705f7444df5c7ed65b3
Author: Adam Huffman <bloch at verdurin.com>
Date:   Wed Jan 5 18:02:24 2011 +0000

    fix merge problem

 bwa.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/bwa.spec b/bwa.spec
index d8cfc49..0a38ab1 100644
--- a/bwa.spec
+++ b/bwa.spec
@@ -50,12 +50,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Jan  5 2011 Adam Huffman <bloch at verdurin.com> - 0.5.8c-1
 - upstream bugfix release
 
->>>>>>> master
 * Tue Jul 20 2010 Adam Huffman <bloch at verdurin.com> - 0.5.8a-1
 - new upstream release