Commit 71c20211 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 c969b742
......@@ -58,6 +58,7 @@
"Icon": "application-x-ruby",
"Id": "KDevRubySupport",
"Name": "Ruby Support",
"Name[ast]": "Sofitu de Ruby",
"Name[ca@valencia]": "Implementació de Ruby",
"Name[ca]": "Implementació de Ruby",
"Name[cs]": "Podpora Ruby",
......
Supports Markdown
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