diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 0 insertions, 4 deletions
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. |