From 2edc49fef2633ee7fe6b7b2a14f4e122e17798e2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Oct 2014 22:44:12 +0000
Subject: Fix mis-merge.

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

diff --git a/debian/changelog b/debian/changelog
index 9087bd105..5702a6dfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -195,15 +195,8 @@ dcpomatic (2.0.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
-<<<<<<< HEAD
 
  -- Carl Hetherington <carl@d1stkfactory>  Wed, 22 Oct 2014 14:24:53 +0100
-=======
-  * New upstream release.
-  * New upstream release.
-
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 24 Oct 2014 01:19:26 +0100
->>>>>>> origin/master
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
-- 
cgit v1.2.3