diff options
| author | James Tanner <tanner.jc@gmail.com> | 2014-03-11 02:32:27 +0100 |
|---|---|---|
| committer | James Tanner <tanner.jc@gmail.com> | 2014-03-11 02:37:34 +0100 |
| commit | cc1537e4ccaec4a354ae3b755f5e3626031577c1 (patch) | |
| tree | faff38edfb49d2710fe6e6df31c710e280bb8dd8 /packaging | |
| parent | Merge pull request #6381 from franckcuny/doc-module-lang (diff) | |
| download | ansible-cc1537e4ccaec4a354ae3b755f5e3626031577c1.tar.xz ansible-cc1537e4ccaec4a354ae3b755f5e3626031577c1.zip | |
Remove remnant merge conflict lines from ansible.spec
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/ansible.spec | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 6be398ef10..71004b652e 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -102,16 +102,14 @@ 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 |