l10n daemon script 087c10cd43 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"

2016-02-05 09:18:18 +00:00

..

contents/ui

use the Id, not the wid

2014-03-05 16:09:54 +01:00

metadata.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2016-02-05 09:18:18 +00:00