New upstream release

8 years ago · dfaa79937f
parent 47f07a5b36
commit dfaa79937f
1 changed files with 0 additions and 1 deletions
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@ -132,7 +132,6 @@ pushd %{py3dir}
 %endif

 %changelog
-<<<<<<< HEAD
 * Fri Dec 23 2016 Michele Baldessari <michele@acksyn.org> - 1.36-1
 - New upstream release