Commit 48d5409c 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 4ed54d55
[Desktop Entry]
Name=Minuet
Name[ast]=Minuet
Name[ca]=Minuet
Name[ca@valencia]=Minuet
Name[cs]=Minuet
......
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