Commit d3cfa4ae 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 63d46f06
[Desktop Entry] [Desktop Entry]
Name=KMuddy Name=KMuddy
Name[bs]=KMuddy Name[bs]=KMuddy
Name[cs]=KMuddy Name[cs]=KMuddy
Name[de]=KMuddy Name[de]=KMuddy
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