Commit 4309aa81 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 e93e2a2c
......@@ -24,6 +24,7 @@ Name=KMail 5.2
Name[ast]=KMail 5.2
Name[ca]=KMail 5.2
Name[ca@valencia]=KMail 5.2
Name[de]=KMail 5.2
Name[es]=KMail 5.2
Name[fi]=KMail 5.2
Name[gl]=KMail 5.2
......
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