Merge master.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 09d40178298a9256211e2b1504703a01fb37445c..1da8a1f91707c709a48beaa08630d3c38924a409 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -171,8 +171,15 @@ dcpomatic (2.0.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+<<<<<<< HEAD
 
  -- Carl Hetherington <carl@dalglish>  Wed, 06 Aug 2014 18:59:35 +0100
+=======
+  * New upstream release.
+  * New upstream release.
+
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 09 Aug 2014 12:38:18 +0100
+>>>>>>> origin/master
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low