[SCM] kemoticons packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-8-g642e3c8

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kemoticons.git;a=commitdiff;h=642e3c8

The following commit has been merged in the kubuntu_wily_archive branch:
commit 642e3c87c3f705e90b1ced0c98145bea6a06c084
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jul 14 17:13:57 2015 -0700

    Fix merge. Remove unused broken backport.
---
 debian/changelog | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16f1206..2a3f3b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,9 @@
-<<<<<<< HEAD
 kemoticons (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Fix merge. Remove unused broken backport.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:07:41 -0700
-=======
-kemoticons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * Vivid backport
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:16:47 -0700
 
 kemoticons (5.11.0-1) unstable; urgency=medium
 
@@ -17,7 +11,6 @@ kemoticons (5.11.0-1) unstable; urgency=medium
   * New upstream release (5.11.0).
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 16:03:48 +0200
->>>>>>> origin/kubuntu_unstable
 
 kemoticons (5.10.0-0ubuntu1) wily; urgency=medium
 

-- 
kemoticons packaging