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

diff --git a/debian/changelog b/debian/changelog
index a671a9e8d..99cdc4f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,4 @@
-<<<<<<< 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.