[SCM] kcoreaddons packaging branch, master, updated. debian/5.37.0-2-101-ga15783a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=d78ad79

The following commit has been merged in the master branch:
commit d78ad79fb4890fd689ed5fe753d190a9a1733df6
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Nov 5 17:26:11 2015 +0100

    Fix merge markers
---
 debian/libkf5coreaddons5.symbols | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/libkf5coreaddons5.symbols b/debian/libkf5coreaddons5.symbols
index 642b2a7..eb1b040 100644
--- a/debian/libkf5coreaddons5.symbols
+++ b/debian/libkf5coreaddons5.symbols
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # SymbolsHelper-Confirmed: 5.15.0+git20151104.0143+15.10 amd64 i386
-=======
-# SymbolsHelper-Confirmed: 5.13.0 amd64
->>>>>>> master
 libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
  _ZN10KAboutData10addLicenseEN13KAboutLicense10LicenseKeyE at Base 4.100.0
  _ZN10KAboutData10pluginDataERK7QString at Base 4.97.0

-- 
kcoreaddons packaging