Fix conflicts

8 years ago · 6862e59eae
parent 355879e745 fd85e4b3eb
commit 6862e59eae
1 changed files with 3 additions and 0 deletions
--- a/python-boto3.spec
+++ b/python-boto3.spec
@ -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