diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5702a6dfd..9087bd105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -195,8 +195,15 @@ dcpomatic (2.0.15-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. +<<<<<<< HEAD -- Carl Hetherington <carl@d1stkfactory> Wed, 22 Oct 2014 14:24:53 +0100 +======= + * New upstream release. + * New upstream release. + + -- Carl Hetherington <carl@d1stkfactory> Fri, 24 Oct 2014 01:19:26 +0100 +>>>>>>> origin/master dcpomatic (0.87-1) UNRELEASED; urgency=low |