Commit d3efe0df 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 8bf41af4
[Desktop Entry]
Name=Yahoo!
Name[ast]=Yahoo!
Name[bg]=Yahoo!
Name[bs]=Yahoo!
Name[ca]=Yahoo!
......
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