[SCM] kate packaging branch, kubuntu_vivid_backports, updated. debian/4.14.2-2-53-g9c4cdb7

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 9c4cdb728e96a83e4a40b3dbef72b855659d1e3b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed May 27 15:37:54 2015 -0700

    manual merge backports.
---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 50fb4ac..8938276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kate (4:15.04.1-0ubuntu2) UNRELEASED; urgency=medium
   [ Scarlett Clark ]
   * Fix merge conflict (changelog version discrepancy)
   * manual merge. 
+  * manual merge backports. 
 
  -- Felix Geyer <debfx at ubuntu.com>  Wed, 27 May 2015 23:44:57 +0200
 

-- 
kate packaging