fix merge

This commit is contained in:
Tom Callaway 2015-09-28 10:32:05 -04:00
commit 1ecfce8773

View File

@ -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