Commit ef8eedc8 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 8140015f
......@@ -24,7 +24,7 @@ Name[it]=KSnakeDuel
Name[kk]=KSnakeDuel
Name[km]=KSpaceDuel
Name[ko]=KSnakeDuel
Name[lt]=KSpaceDuel
Name[lt]=KSnakeDuel
Name[lv]=KSpaceDuel
Name[mr]=के-स्नेक-ड्युएल
Name[nb]=KSnakeDuel
......
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