[SCM] khangman packaging branch, master, updated. debian/4%17.08.3-2-57-gcf2daea

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c1a3ac60b7fe92ae33a11cf6d626a392c0884e91
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Jul 8 10:28:23 2016 +0100

    tidy mad merge
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 033fb9e..38565bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,6 @@ khangman (4:16.04.1-1) unstable; urgency=medium
   * debian/control: Update Vcs-Browser and Vcs-Git fields
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 26 May 2016 00:47:54 +0200
->>>>>>> master
 
 khangman (4:15.12.1-1) experimental; urgency=medium
 

-- 
khangman packaging