[SCM] signon-kwallet-extension packaging branch, kubuntu_stable, updated. ubuntu/4%15.08.2-0ubuntu1-29-g0192741

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/signon-kwallet-extension.git;a=commitdiff;h=0192741

The following commit has been merged in the kubuntu_stable branch:
commit 019274126edfa9bc6693849144799101ea918a86
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 8 16:34:10 2016 +0000

    Removing UNRELEASED version from changelog
    
    -Removed UNRELEASED entry introduced when merged with Debian master
---
 debian/changelog | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 154e28e..5c4f57e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,18 +86,3 @@ signon-kwallet-extension (4:15.04.2-0ubuntu1) wily; urgency=medium
   * New upstream release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 22:44:03 +0200
-
-<<<<<<<
-=======
-signon-kwallet-extension (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
-
-  [ Scarlett Clark ]
-  * New upstream release.
-  * Add watch file
-  * wrap-and-sort
-
-  [ Harald Sitter ]
-  * Initial release.
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 13 May 2015 23:18:09 -0700
->>>>>>>

-- 
signon-kwallet-extension packaging