projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bd8353
)
Fix mis-merge.
author
Carl Hetherington
<cth@carlh.net>
Sun, 26 Oct 2014 22:44:12 +0000
(22:44 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 26 Oct 2014 22:44:12 +0000
(22:44 +0000)
debian/changelog
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index 9087bd1051a832f11a1182d21c1fc22c8ea2229b..5702a6dfd4ad3381feacb2aa813967c6f5ab271f 100644
(file)
--- 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