[SCM] Amarok packaging branch, master, updated. debian/2.8.0-4-5-g846634d

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=846634d

The following commit has been merged in the master branch:
commit 846634d84300bce88d13e21f88ad10454b00de56
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 16 09:22:09 2016 +0200

    fix changelog
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 54df22c..10360ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ amarok (2.8.0-4.1) unstable; urgency=medium
       virtual-mysql-server-core to allow mariadb usage (closes: #815567).
 
  -- Samuel Henrique Oltramari Pinto (SamuelOPH) <samueloph at gmail.com>  Sun, 27 Mar 2016 12:43:01 -0300
->>>>>>> nmu
 
 amarok (2.8.0-4) unstable; urgency=medium
 

-- 
Amarok packaging