Fix merge conflict

i9ce
Fabio Alessandro Locati 9 years ago
commit 6bc638dfcd

@ -13,7 +13,7 @@
Name: python-%{pypi_name} Name: python-%{pypi_name}
Version: 1.2.3 Version: 1.2.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: The AWS SDK for Python Summary: The AWS SDK for Python
License: ASL 2.0 License: ASL 2.0
@ -97,8 +97,11 @@ rm -rf %{pypi_name}.egg-info
%endif # with_python3 %endif # with_python3
%changelog %changelog
* Thu Feb 11 2016 Fabio Alessandro Locati <fabio@locati.cc> - 1.2.3-2 * Thu Feb 11 2016 Fabio Alessandro Locati <fabio@locati.cc> - 1.2.3-3
- Fix python2- subpackage to require python-future - Fix python2- subpackage to require python-future
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Dec 29 2015 Fabio Alessandro Locati <fabio@locati.cc> - 1.2.3-1 * Tue Dec 29 2015 Fabio Alessandro Locati <fabio@locati.cc> - 1.2.3-1
- Initial package. - Initial package.

Loading…
Cancel
Save