[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=5ad75b4

The following commit has been merged in the master branch:
commit 5ad75b46f88860f10976f8e4a93c0b5991002669
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Oct 18 09:57:30 2016 +0000

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 plugins/sendnotifications/kdeconnect_sendnotifications.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json
index 5c8d026..7a76177 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@ -5,7 +5,6 @@
             {
                 "Email": "holger.k at elberer.de", 
                 "Name": "Holger Kaelberer", 
-                "Name[it]": "Holger Freyther", 
                 "Name[x-test]": "xxHolger Kaelbererxx"
             }
         ], 

-- 
kdeconnect packaging