Fix merge.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b69567a2d853623a235a0397c343012eb8f38bc2..6538c05ecd542e2ff5e901461200044457662129 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,9 +164,7 @@ dcpomatic (1.71.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
 
-<<<<<<< HEAD  * New upstream release.
-
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 28 Jun 2014 00:53:18 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low