From 31f33d5e2950bbc80395e442bf5dece5d6cbf34a Mon Sep 17 00:00:00 2001
From: Adam Huffman <verdurin@fedoraproject.org>
Date: Oct 26 2013 22:54:20 +0000
Subject: Update to upstream 0.7.5a


---

diff --git a/bwa.spec b/bwa.spec
index d88d2b4..82a19e2 100644
--- a/bwa.spec
+++ b/bwa.spec
@@ -1,6 +1,6 @@
 Name:           bwa
-Version:        0.6.1
-Release:        7%{?dist}
+Version:        0.7.5a
+Release:        1%{?dist}
 Summary:        Burrows-Wheeler Alignment tool
 
 Group:          Applications/Engineering
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 26 2013 Adam Huffman <bloch@verdurin.com> - 0.7.5a-1
+- Update to upstream 0.7.5a
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -70,7 +73,6 @@ rm -rf %{buildroot}
 
 * Mon May 28 2012 Dan Horák <dan[at]danny.cz> - 0.6.1-3
 - enable SSE2 on x86_64 only, fixes build on secondary arches
->>>>>>> 6eb5c7e2c8410ef80049626369f6b02dd2189604
 
 * Sun May 13 2012 Adam Huffman <verdurin@fedoraproject.org> - 0.6.1-2
 - add patch to avoid SSE2 on i386