Commit a2dcaf1b authored by Script Kiddy's avatar Script Kiddy

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 32e17f9e
......@@ -53,7 +53,6 @@
"Name[tr]": "Hızlı Aç",
"Name[uk]": "Швидке відкриття",
"Name[x-test]": "xxQuick Openxx",
"Name[zh_CN]": "快速打开",
"ServiceTypes": [
"KDevelop/Plugin"
]
......
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