Commit 48f7bf19 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 9a3fea6e
......@@ -7,6 +7,7 @@
<name xml:lang="ca">KMag</name>
<name xml:lang="ca-valencia">KMag</name>
<name xml:lang="cs">KMag</name>
<name xml:lang="da">KMag</name>
<name xml:lang="de">KMag</name>
<name xml:lang="el">KMag</name>
<name xml:lang="en-GB">KMag</name>
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