Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/python-mutagen

8 years ago · 47f07a5b36
parent bd15ebd877 8642ba4af7
commit 47f07a5b36
1 changed files with 4 additions and 0 deletions
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@ -132,9 +132,13 @@ pushd %{py3dir}
 %endif

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

+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.35.1-2
+- Rebuild for Python 3.6
+
 * Thu Nov 10 2016 Michele Baldessari <michele@acksyn.org> - 1.35.1
 - New upstream release