diff options
| author | James Tanner <tanner.jc@gmail.com> | 2014-03-10 18:55:17 -0400 |
|---|---|---|
| committer | James Tanner <tanner.jc@gmail.com> | 2014-03-10 18:55:17 -0400 |
| commit | 7b6d5e7bbf38a44bd8a4616138a1b2d5b1dfc540 (patch) | |
| tree | 5b371c100bf6bbc743b6e92b053c1938a7325717 /packaging/rpm | |
| parent | 2fa6110961613b40906614abf5f3d83d23c081ae (diff) | |
| parent | 16c05cbc8892041cacba3ff87c86e68b86b4511b (diff) | |
| download | ansible-7b6d5e7bbf38a44bd8a4616138a1b2d5b1dfc540.tar.gz | |
Fix merge conflicts from 1.5.1 release notes
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/ansible.spec | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index d3783c1e9c..6be398ef10 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -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 |