X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=a0f55e2d12c33a6a572584d8db5606097f935534;hb=7278bc78ef3adec819e6b811dd02b8883769cfbb;hp=9087bd1051a832f11a1182d21c1fc22c8ea2229b;hpb=b6c780d3107557d452c6612d715d01e2be52dbda;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 9087bd105..a0f55e2d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.15-1) UNRELEASED; urgency=low
+dcpomatic (2.0.33-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -195,15 +195,25 @@ 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.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
   * New upstream release.
   * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 24 Oct 2014 01:19:26 +0100
->>>>>>> origin/master
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 11:36:01 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low