X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=9087bd1051a832f11a1182d21c1fc22c8ea2229b;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=6f3d19700feaabba84e45680287888d6faa1f6f2;hpb=360f49fad409d1e37318ffcf3069c4111c19c7b8;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 6f3d19700..9087bd105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.76.6-1) UNRELEASED; urgency=low
+dcpomatic (2.0.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -195,10 +195,15 @@ dcpomatic (1.76.6-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