Fixing a bad merge commit in packaging/debian/changelog

93fb82a5 · James Cammarata · f8ca24b0 · 93fb82a5
Commit 93fb82a5 authored Apr 30, 2014 by James Cammarata
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

packaging/debian/changelog
+0 -4

No files found.
--- 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