Commit 596b2e71 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 05534cbb
......@@ -18,6 +18,7 @@
"Name": "Python",
"Name[ca@valencia]": "Python",
"Name[ca]": "Python",
"Name[cs]": "Python",
"Name[es]": "Python",
"Name[et]": "Python",
"Name[nl]": "Python",
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