Viewing all changes in revision 652.
- Committer: l10n daemon script
- Date: 2020-06-17 12:00:17 UTC
- Revision ID: git-v1:224d912952af52c49d01b7776c9f3ae88f19dbbd
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"
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"
expand all
collapse all
added
removed
