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