From 27882eb23d0a0ecfdd4e2d06120ef3c047c733f3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Jun 2020 13:58:15 +0200 Subject: 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" --- src/core/kconfigbackend.desktop | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 56702e15..fa4268d9 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -82,7 +82,6 @@ Comment[ug]=KConfig نىڭ ساقلاش ئارقا ئۇچى Comment[uk]=Модуль зберігання даних для KConfig Comment[vi]=Hậu trường lưu trữ cho KConfig Comment[wa]=Bouye di fond di stocaedje po KConfig -Comment[x-test]=xxStorage backend for KConfigxx Comment[zh_CN]=KConfig 存储后端 Comment[zh_TW]=KConfig 儲存後端介面 -- cgit v1.2.1