Fix merge.

diff --git a/debian/changelog b/debian/changelog
index 2cb6795fa2c6ed5bdb2776850297696b9be41599..17f8b311a3147aa49f4206ff2c8bdc68712aa0b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,11 +164,7 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
 
-<<<<<<< HEAD
  -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
-=======
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 27 Jun 2014 13:25:44 +0100
->>>>>>> 1.70.0-hotfix
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low