Commit 127ce16b authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 1444a2d6
......@@ -43,6 +43,7 @@
"Name[sv]": "Markdown-gränssnitt",
"Name[uk]": "Модуль Markdown",
"Name[x-test]": "xxMarkdown Backendxx",
"Name[zh_CN]": "Markdown 后端",
"ServiceTypes": [
"okular/Generator"
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment