Merge master.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 99cdc4f584e257115a9bf41656bfbcdd3a4f69b8..a671a9e8dd38df8a602e17b626ab8b705cbb2b66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 dcpomatic (2.0.4-1) UNRELEASED; urgency=low
+=======
+dcpomatic (1.73.0-1) UNRELEASED; urgency=low
+>>>>>>> origin/master
 
   * New upstream release.
   * New upstream release.