X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fchangelog;h=a671a9e8dd38df8a602e17b626ab8b705cbb2b66;hb=2d24bc7aaed800415bce4fffe06f261d5e9e464a;hp=99cdc4f584e257115a9bf41656bfbcdd3a4f69b8;hpb=fdc07bf53d35196bfe6514f34fa885dcfe9bc4b8;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 99cdc4f58..a671a9e8d 100644
--- 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.