Commit dea375dd 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 fe69ba4f
[Icon Theme] [Icon Theme]
Name=Breeze Name=Breeze
Name[ca]=Brisa Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[es]=Brisa Name[es]=Brisa
Name[nl]=Breeze Name[nl]=Breeze
Name[pt]=Brisa Name[pt]=Brisa
......
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