[SCM] kfilemetadata packaging branch, kubuntu_stable, updated. 4d0eefa20b8382ec40d331cb55a89274781315bf

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kfilemetadata.git;a=commitdiff;h=0623000

The following commit has been merged in the kubuntu_stable branch:
commit 0623000f043e63e909f27c95d1ac306e8cca4e51
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 13 14:53:06 2014 +0100

    fix bogus merge
---
 debian/changelog | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6d0f04..c323787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,16 +12,10 @@ kfilemetadata-kf5 (5.1.0.1-0ubuntu1) UNRELEASED; urgency=medium
 
 kfilemetadata-kf5 (5.0.2-0ubuntu1) utopic; urgency=medium
 
-<<<<<<<
-  * New upstream release
-  * Rename -dev package without version for consistency.
-  * Add replace/ break to the old package.
-=======
   * New upstream release
   * Rename -dev package without version for consistency.
   * Add replace/ break to the old package.
   * Remove no-human-maintainers lintian-override per ScottK 
->>>>>>>
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Sep 2014 07:04:40 -0700
 

-- 
kfilemetadata packaging