diff options
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 2cb6795fa..17f8b311a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -164,11 +164,7 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. -<<<<<<< HEAD -- Carl Hetherington <carl@d1stkfactory> Thu, 26 Jun 2014 19:30:39 +0100 -======= - -- Carl Hetherington <carl@d1stkfactory> Fri, 27 Jun 2014 13:25:44 +0100 ->>>>>>> 1.70.0-hotfix dcpomatic (0.87-1) UNRELEASED; urgency=low |