Commit 571560db 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 613e2724
[KTuberlingTheme]
Name=Butterflies
Name[ast]=Caparines
Name[bs]=Leptirići
Name[ca]=Papallones
Name[ca@valencia]=Papallones
......
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