diff options
| author | James Cammarata <jimi@sngx.net> | 2014-04-30 13:57:58 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2014-04-30 13:59:20 -0500 |
| commit | 93fb82a5a1ea98c1121d778d5bf7d711a2edcfa7 (patch) | |
| tree | 34092c0a1f68b5c35ef34384f7ed50abf3f13dd6 | |
| parent | f8ca24b0469f14b1f71f956a2733fc8b4c889e77 (diff) | |
| download | ansible-93fb82a5a1ea98c1121d778d5bf7d711a2edcfa7.tar.gz | |
Fixing a bad merge commit in packaging/debian/changelog
| -rw-r--r-- | packaging/debian/changelog | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 297c47715b..6cdf9bb6ec 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -38,11 +38,7 @@ ansible (1.5) unstable; urgency=low * 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 ->>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b ansible (1.4.5) unstable; urgency=low |