[bwa/el6/master] Fix conflict

[verdurin]

commit 8246ec4ccedf934e4b0d178972e4c9d7d0013f0b
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Jan 14 10:17:41 2011 +0000

    Fix conflict

 bwa.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/bwa.spec b/bwa.spec
index 24973e7..0a38ab1 100644
--- a/bwa.spec
+++ b/bwa.spec
@@ -50,7 +50,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-=======
 * Wed Jan  5 2011 Adam Huffman <bloch at verdurin.com> - 0.5.8c-1
 - upstream bugfix release