Fix mis-merge.

diff --cc debian/changelog
index 5702a6dfd4ad3381feacb2aa813967c6f5ab271f,5dedc91f00ce991f4799fc5bd4d340349898bd65..4b2cdee29797539e12adc28c1a795020b4f96ce0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -195,9 -195,11 +195,13 @@@ dcpomatic (2.0.16-1) UNRELEASED; urgenc
    * 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.
+ 
+  -- Carl Hetherington <carl@d1stkfactory>  Sun, 26 Oct 2014 22:43:43 +0000
+ 
  dcpomatic (0.87-1) UNRELEASED; urgency=low
  
    * New upstream release.