diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-28 00:53:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-28 00:53:41 +0100 |
| commit | 6bcf76cc22ff0ed9c5598e1d92b05f93f37a510a (patch) | |
| tree | 6d3280819c82b6573f68123a6af08e0bf953feee | |
| parent | fd5567a6bbecf6f7e213e25284b3baf01f7a96e2 (diff) | |
Fix merge.
| -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 |