[qgis] 02/03: Rebuild for jessie-backports.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository qgis.

commit 3046e625d031c988ab3ce912a3622ff42a4e744f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 25 07:42:54 2017 +0100

    Rebuild for jessie-backports.
---
 debian/changelog | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d88db12..8f60922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.11+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 25 Jan 2017 07:42:42 +0100
+
 qgis (2.14.11+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.
@@ -76,20 +82,18 @@ qgis (2.14.9+dfsg-1~exp1) experimental; urgency=medium
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 25 Nov 2016 15:37:03 +0100
 
-<<<<<<< HEAD
-qgis (2.14.8+dfsg-1~bpo8+1) jessie-backports; urgency=medium
-
-  * Rebuild for jessie-backports.
-
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Nov 2016 09:38:35 +0100
-=======
 qgis (2.14.8+dfsg-2~exp1) experimental; urgency=medium
 
   * Update symbols for other architectures.
   * Update dependencies & paths for GRASS 7.2.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Oct 2016 16:49:30 +0200
->>>>>>> debian/2.14.11+dfsg-1
+
+qgis (2.14.8+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Nov 2016 09:38:35 +0100
 
 qgis (2.14.8+dfsg-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git