[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=80173d4

The following commit has been merged in the master branch:
commit 80173d4b72c9da81ec1fa92dfddfdc7b2e62ccbf
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 8 09:52:41 2015 +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"
---
 plasma-runner-ktp-contact.desktop.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plasma-runner-ktp-contact.desktop.cmake b/plasma-runner-ktp-contact.desktop.cmake
index dd048e1..20ed2bd 100644
--- a/plasma-runner-ktp-contact.desktop.cmake
+++ b/plasma-runner-ktp-contact.desktop.cmake
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Instant Messaging
-Name[ast]=Mensaxería nel intre
 Name[bs]=Brze poruke
 Name[ca]=Missatgeria instantània
 Name[ca at valencia]=Missatgeria instantània

-- 
ktp-contact-runner packaging