X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=9087bd1051a832f11a1182d21c1fc22c8ea2229b;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=34a4544e5d22672c1a18e7f800be11d6b039c9c0;hpb=9848887b821cba1522ae252f6ca2d54db2ff9ce3;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 34a4544e5..9087bd105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.76.4-1) UNRELEASED; urgency=low
+dcpomatic (2.0.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -195,8 +195,15 @@ dcpomatic (1.76.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+<<<<<<< HEAD
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 23 Oct 2014 22:02:47 +0100
+ -- 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