[bwa] Fix conflict error

[verdurin]

commit f55c427835dcfd146a0436db9d350c09d19ae4d2
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Jan 14 10:15:15 2011 +0000

    Fix conflict error

 bwa.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/bwa.spec b/bwa.spec
index d8cfc49..24973e7 100644
--- a/bwa.spec
+++ b/bwa.spec
@@ -50,12 +50,10 @@ 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