[SCM] kpmcore packaging branch, master, updated. 8a00e5fbc231d97e54a448fb39db2c636ec60d21

[Jonathan Cristopher Carter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kpmcore.git;a=commitdiff;h=8a00e5f

The following commit has been merged in the master branch:
commit 8a00e5fbc231d97e54a448fb39db2c636ec60d21
Author: Jonathan Carter <jcarter at linux.com>
Date:   Tue Sep 5 12:38:18 2017 +0200

    New upstream release
---
 debian/changelog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9023f56..54df220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 kpmcore (3.1.2-2) unstable; urgency=medium
 
   * Add corresponding breaks field for the replace field (Closes: #870435)
@@ -7,8 +6,6 @@ kpmcore (3.1.2-2) unstable; urgency=medium
 
  -- Jonathan Carter <jcc at debian.org>  Tue, 29 Aug 2017 09:45:05 +0200
 
-=======
->>>>>>> e988a39f67713170ac8d767e9010940fd2da9b6f
 kpmcore (3.1.2-1) unstable; urgency=medium
 
   * New upstream release

-- 
kpmcore packaging