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"
6 years ago · 56a44a5de2
parent 27882eb23d
commit 56a44a5de2
1 changed files with 1 additions and 0 deletions
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@ -82,6 +82,7 @@ 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 儲存後端介面