[SCM] kalzium packaging branch, master, updated. debian/16.08.3-1-69-gd174ceb

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalzium.git;a=commitdiff;h=ae963db

The following commit has been merged in the master branch:
commit ae963dbc612fa6044f426eb600e4ecf914564920
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Feb 28 18:04:24 2017 +0100

    Fix merge markers
---
 debian/watch | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/watch b/debian/watch
index ffd4de2..0ab387e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,3 @@
 version=4
-<<<<<<< HEAD
 opts=pgpsigurlmangle=s/$/.sig/ \
  http://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
-=======
-opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/kalzium-([\d.]+).tar.xz
->>>>>>> Neon/release-lts

-- 
kalzium packaging