fix merge
This commit is contained in:
commit
1ecfce8773
@ -118,9 +118,13 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
<<<<<<< HEAD
|
||||||
* Mon Sep 28 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-1
|
* Mon Sep 28 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-1
|
||||||
- update to 4.0 final
|
- 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
|
* Wed Sep 9 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-0.12.b3
|
||||||
- update to 4.0b3
|
- update to 4.0b3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user