Fix conflicts
This commit is contained in:
commit
6862e59eae
@ -115,6 +115,9 @@ rm -rf tests/integration
|
||||
* Wed Dec 28 2016 Fabio Alessandro Locati <fale@fedoraproject.org> 1.4.3-1
|
||||
- Update to 1.4.3
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.4.2-2
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Sat Dec 03 2016 Fabio Alessandro Locati <fale@fedoraproject.org> 1.4.2-1
|
||||
- Update to 1.4.2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user