branches with status:
Name Status Last Modified Last Commit
lp:apper 1 Development 2018-10-10 04:21:39 UTC 2018-10-10
1149. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:21:39 UTC

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"

11 of 1 result