[SCM] kbookmarks packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-6-g4c39a12

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 4c39a12ed63c54a399ad0871a151707d459d184d
Merge: c5b6f3aafaa5c75404ef4a08f0d54f12ed3d05bc 6236d8a7474907a5c571b0184f3e0870f60f9888
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:21:35 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --cc debian/changelog
index 20f6eb0,f2326c7..d6817df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,14 @@@
++<<<<<<< HEAD
 +kbookmarks (5.11.0-1) unstable; urgency=medium
++=======
+ kbookmarks (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- 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
  
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).

-- 
kbookmarks packaging