[SCM] kfilemetadata packaging branch, kubuntu_wily_archive, updated. debian/5.6.2-1-33-gb3831f1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit b3831f19fcc8a15e3572ea46c75a2776179fffc0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 20:48:29 2015 +0200

    fix merge
---
 debian/libkf5filemetadata3.symbols | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/libkf5filemetadata3.symbols b/debian/libkf5filemetadata3.symbols
index 8c4f519..657cde4 100644
--- a/debian/libkf5filemetadata3.symbols
+++ b/debian/libkf5filemetadata3.symbols
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# SymbolsHelper-Confirmed: 5.6.95 amd64
-=======
 # SymbolsHelper-Confirmed: 5.9.0 amd64
->>>>>>> master
 libKF5FileMetaData.so.3 libkf5filemetadata3 #MINVER#
  _ZN13KFileMetaData12PropertyInfo8fromNameERK7QString at Base 5.0.0
  _ZN13KFileMetaData12PropertyInfoC1ENS_8Property8PropertyE at Base 5.0.0
@@ -59,11 +55,7 @@ libKF5FileMetaData.so.3 libkf5filemetadata3 #MINVER#
  _ZN13KFileMetaData22SimpleExtractionResultD1Ev at Base 5.0.2+git20140925
  _ZN13KFileMetaData22SimpleExtractionResultD2Ev at Base 5.0.2+git20140925
  _ZN13KFileMetaData22SimpleExtractionResultaSERKS0_ at Base 5.0.2+git20140925
-<<<<<<< HEAD
- _ZN13KFileMetaData8TypeInfo8fromNameERK7QString at Base 5.6.95
-=======
  _ZN13KFileMetaData8TypeInfo8fromNameERK7QString at Base 5.9.0
->>>>>>> master
  _ZN13KFileMetaData8TypeInfoC1ENS_4Type4TypeE at Base 5.0.0
  _ZN13KFileMetaData8TypeInfoC1ERKS0_ at Base 5.0.0
  _ZN13KFileMetaData8TypeInfoC2ENS_4Type4TypeE at Base 5.0.0

-- 
kfilemetadata packaging