summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-31 16:59:31 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-31 16:59:31 +0200
commit6983d8b9d5c617806cb0e919558c357da69ded7f (patch)
tree8961b411e214cc224197d85e4bcc3553e4488bf9 /debian
parent0ee5fe3e95cca43095732fc652fb39ca3f78e81a (diff)
parent22f4d936a5ef1584c9bfaa406f81b7ee975a4de5 (diff)
Add upstream changes to changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index de3015f..005478a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
simple-scan (3.13.91-1) unstable; urgency=medium
* New upstream release.
+<<<<<<< HEAD
- Updated translations.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 31 Aug 2014 08:37:44 +0200
+=======
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 30 Aug 2014 08:16:27 +0200
+>>>>>>> 22f4d936a5ef1584c9bfaa406f81b7ee975a4de5
simple-scan (3.13.90-1) unstable; urgency=medium