Commit 448aafe4 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 0bdaf2dc
[Icon Theme]
Name=Breeze
Name[ca]=Brisa
Name[es]=Brisa
Name[nl]=Breeze
Name[pt]=Brisa
Name[sv]=Breeze
Name[uk]=Breeze
Name[x-test]=xxBreezexx
Inherits=default
Directories=default
......
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