summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 17b5c70..005478a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +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