ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-22 12:03:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts from 1.5.1 release notes

Browse source
This commit is contained in:
James Tanner 2014-03-10 18:55:17 -04:00
commit 7b6d5e7bbf
5 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/rpm/ansible.spec
View file

@ -102,8 +102,16 @@ rm -rf %{buildroot}
%changelog
<<<<<<< HEAD
* Thu Feb 28 2014 Michael DeHaan <michael.dehaan@gmail.com> - 1.6-0
* (PENDING)
=======
* Fri Mar 10 2014 Michael DeHaan <michael@ansible.com> - 1.5.1
- Release 1.5.1
* Fri Feb 28 2014 Michael DeHaan <michael@ansible.com> - 1.5.0
- Release 1.5.0
>>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b
* Thu Feb 28 2014 Michael DeHaan <michael.dehaan@gmail.com> - 1.5-0
* Release 1.5