[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.12.4-2-9-gcc8d20f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=9a94e4f

The following commit has been merged in the master branch:
commit 9a94e4f77399fcfca98674bb15fc27db6368fa9a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 16 23:56:42 2014 +0200

    Cleanup merge artifact
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b6dba65..433f226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,6 @@ kdepim-runtime (4:4.12.2-1) experimental; urgency=medium
   * Bump kde-sc-dev-latest build dependency.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:30 +0100
->>>>>>> kde4.12
 
 kdepim-runtime (4:4.11.5-1) unstable; urgency=medium
 

-- 
KDE PIM Runtime module packaging