This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch ubuntu/xenial
in repository qgis.
commit 96fc1f6854ee665a4424fd2a37d2f5b509565e01
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jan 28 14:50:29 2018 +0100
Fix left over from changelog merge.
---
debian/changelog | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5db6629..673a911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -190,7 +190,6 @@ qgis (2.14.18+dfsg-1~exp1) experimental; urgency=medium
* Update symbols for amd64.
-- Bas Couwenberg <sebas...@debian.org> Fri, 18 Aug 2017 20:00:55 +0200
->>>>>>> debian/2.14.22+dfsg-1
qgis (2.14.17+dfsg-1) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
