[SCM] KDE Base Applications module packaging branch, kubuntu_vivid_backports, updated. ubuntu/15.08.0-0ubuntu2-18-g8df01e7

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=8df01e7

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 8df01e70a68549b70972e7b11d71019f00bc9ab1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Oct 5 04:58:14 2015 -0700

    Fix series file.
---
 debian/changelog      | 2 +-
 debian/patches/series | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e93e932..3e9c5d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 kde-baseapps (4:15.08.1-0ubuntu1) UNRELEASED; urgency=medium
 
   * Vivid backport.
-  * 
+  * Fix series file.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 04:19:17 -0700
 
diff --git a/debian/patches/series b/debian/patches/series
index d85a60c..05eb32a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,5 @@ kubuntu_folderview_livecd_directory.diff
 kubuntu_folderwidget_drawing.diff
 kubuntu_install_flash.diff
 kubuntu_disable-failing-test.diff
-<<<<<<< HEAD
-=======
 kubuntu_ignore-tests.diff
->>>>>>> origin/kubuntu_wily_archive
+

-- 
KDE Base Applications module packaging