cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove remnant merge conflict lines from ansible.spec

Browse source
This commit is contained in:
James Tanner 2014-03-10 21:32:27 -04:00
parent 84f918d320
commit cc1537e4cc
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/rpm/ansible.spec
View file

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