Skip to content

A
ansible
Commit cc1537e4 by James Tanner
Options

Remove remnant merge conflict lines from ansible.spec

parent 84f918d3
Showing with 1 additions and 3 deletions
packaging/rpm/ansible.spec
...@@ -102,16 +102,14 @@ rm -rf %{buildroot} ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment