Viewing all changes in revision 1192.
- Committer: l10n daemon script
- Date: 2019-10-20 03:14:21 UTC
- Revision ID: git-v1:ebf08506c6b77d3955ec8b82bd8658b02d45a669
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
