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

2015-05-01 10:21:06 +00:00

..

contents/ui

don'rthave commented out imports in examples

2014-03-18 13:47:17 +01:00

metadata.desktop

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

2015-05-01 10:21:06 +00:00