diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-26 22:44:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-26 22:44:12 +0000 |
| commit | 2edc49fef2633ee7fe6b7b2a14f4e122e17798e2 (patch) | |
| tree | ed28d5b0a589309aeb04b5f64b429e2055c6d436 /debian | |
| parent | 0bd835375d015ef353cf4a7927e25afd140466d9 (diff) | |
Fix mis-merge.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 9087bd105..5702a6dfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -195,15 +195,8 @@ 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 |