[SCM] kbookmarks packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-7-g030cb0a

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kbookmarks.git;a=commitdiff;h=030cb0a

The following commit has been merged in the kubuntu_unstable branch:
commit 030cb0a9f2e2998c85f6a21df7386ba6f615d2a1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:23:57 2015 -0700

    clean merge.
---
 debian/changelog | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6817df..38cfa5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,26 @@
-<<<<<<< HEAD
-kbookmarks (5.11.0-1) unstable; urgency=medium
-=======
 kbookmarks (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Vivid backport
+  * clean up merge. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:05:47 -0700
 
-kbookmarks (5.10.0-0ubuntu1) wily; urgency=medium
->>>>>>> origin/kubuntu_vivid_backports
+kbookmarks (5.11.0-1) unstable; urgency=medium
 
   [ Maximiliano Curia ]
-  * New upstream release (5.10.0).
   * New upstream release (5.11.0).
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 22:20:18 +0200
 
 kbookmarks (5.10.0-0ubuntu1) wily; urgency=medium
 
+  [ Maximiliano Curia ]
+  * New upstream release (5.10.0).
+ 
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 22:20:18 +0200
+
+kbookmarks (5.10.0-0ubuntu1) wily; urgency=medium
+
   [ Jonathan Riddell ]
   * New upstream release
 

-- 
kbookmarks packaging