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