internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 22:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a bad merge commit in packaging/debian/changelog

Browse Source
This commit is contained in:
James Cammarata
2014-04-30 13:57:58 -05:00
parent f8ca24b046
commit 93fb82a5a1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/debian/changelog
View File

@@ -38,11 +38,7 @@ ansible (1.5) unstable; urgency=low
* 1.5 release * 1.5 release
<<<<<<< HEAD
-- Michael DeHaan <michael.dehaan@gmail.com> Fri, 28 February 2014 15:00:02 -0500
=======
-- Michael DeHaan <michael@ansible.com> Fri, 28 February 2014 00:00:00 -0500 -- Michael DeHaan <michael@ansible.com> Fri, 28 February 2014 00:00:00 -0500
>>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b
ansible (1.4.5) unstable; urgency=low ansible (1.4.5) unstable; urgency=low