From 6adc5512a35c980f7b164705f7444df5c7ed65b3 Mon Sep 17 00:00:00 2001
From: Adam Huffman <bloch@verdurin.com>
Date: Jan 05 2011 18:02:24 +0000
Subject: fix merge problem


---

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@verdurin.com> - 0.5.8c-1
 - upstream bugfix release
 
->>>>>>> master
 * Tue Jul 20 2010 Adam Huffman <bloch@verdurin.com> - 0.5.8a-1
 - new upstream release