Viewing all changes in revision 208.
- Committer: l10n daemon script
- Date: 2020-06-18 03:35:01 UTC
- Revision ID: git-v1:e3cfe6acd81d66691d22f012dbecee8d24664260
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
