[SCM] kscreenlocker packaging branch, master, updated. debian/5.7.4-1-50-gac9136b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit dee2a24b86e2566aaa418c2176162a2f1639cfc9
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Oct 5 19:16:46 2016 +0200

    trivial: merge error
    
    Gbp-Dch: Ignore
---
 debian/control | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/control b/debian/control
index 0c0cb50..42d305a 100644
--- a/debian/control
+++ b/debian/control
@@ -69,5 +69,3 @@ Breaks: plasma-workspace (<= 4:5.5.0~), ${kde-l10n:all}
 Replaces: plasma-workspace (<= 4:5.5.0~), ${kde-l10n:all}
 Description: KCM Module for kscreenlocker
  KDE systemsettings module to configure kscreenlocker
-Description: KCM Module for kscreenlocker
- KDE systemsettings module to configure kscreenlocker

-- 
kscreenlocker packaging