From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Oct 2014 22:44:12 +0000 (+0000)
Subject: Fix mis-merge.
X-Git-Tag: v2.0.48~535
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=2edc49fef2633ee7fe6b7b2a14f4e122e17798e2;p=dcpomatic.git

Fix mis-merge.
---

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