fix merge

9 years ago · 1ecfce8773
parent d1820d62c6 354af01958
commit 1ecfce8773
1 changed files with 4 additions and 0 deletions
--- a/python-coverage.spec
+++ b/python-coverage.spec
@ -118,9 +118,13 @@ popd


 %changelog
+<<<<<<< HEAD
 * Mon Sep 28 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-1
 - update to 4.0 final

+* Wed Sep 23 2015 Robert Kuska <rkuska@redhat.com> - 4.0-0.13.b3
+- Rebuilt for Python3.5 rebuild
+
 * Wed Sep  9 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-0.12.b3
 - update to 4.0b3