From c59039244ff0b89da9b276338e6ab171b523dcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 31 Aug 2014 18:11:40 +0200
Subject: revert git pull output from debian/changelog

---
 debian/changelog | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 005478a..de3015f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,9 @@
 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
 
-- 
cgit v1.2.3