From 6bcf76cc22ff0ed9c5598e1d92b05f93f37a510a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 28 Jun 2014 00:53:41 +0100
Subject: Fix merge.

---
 debian/changelog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2cb6795fa..17f8b311a 100644
--- 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
 
-- 
cgit v1.2.3