Commit 04c17035 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 6fc255c3
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=Mycroft Bigscreen Name=Mycroft Bigscreen
Name[ca]=Pantalla gran del Mycroft Name[ca]=Bigscreen del Mycroft
Name[ca@valencia]=Pantalla gran del Mycroft Name[ca@valencia]=Pantalla gran del Mycroft
Name[es]=Mycroft Bigscreen Name[es]=Mycroft Bigscreen
Name[et]=Mycrofti suurekraan Name[et]=Mycrofti suurekraan
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