Skip to content
Branch: master
Find file History
l10n daemon script
l10n daemon script 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"
Latest commit a1ba8c9 Jun 8, 2019
Permalink
Type Name Latest commit message Commit time
..
Failed to load latest commit information.
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours Jun 9, 2019
You can’t perform that action at this time.