[SCM] kaccounts-integration packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-62-gd56cd85

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=d56cd85

The following commit has been merged in the kubuntu_xenial_archive branch:
commit d56cd85262855dac08fa3405a4d65d8003471e8f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Jan 28 18:13:30 2016 -0800

    Fix install file.
---
 debian/changelog                            | 1 +
 debian/qml-module-org-kde-kaccounts.install | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac8741b..21bf676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kaccounts-integration (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release.
   * Debian merge: No remaining changes.
   * Actually bump the version...
+  * Fix install file. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 28 Jan 2016 13:44:50 -0800
 
diff --git a/debian/qml-module-org-kde-kaccounts.install b/debian/qml-module-org-kde-kaccounts.install
index 5a17a98..4849c4d 100644
--- a/debian/qml-module-org-kde-kaccounts.install
+++ b/debian/qml-module-org-kde-kaccounts.install
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-usr/lib/*/qt5/qml/org/kde/kaccounts/*
-=======
 usr/lib/*/qt5/qml/org/kde/kaccounts/libkaccountsdeclarativeplugin.so
 usr/lib/*/qt5/qml/org/kde/kaccounts/qmldir
->>>>>>> master

-- 
kaccounts-integration packaging