Viewing all changes in revision 3529.
- Committer: l10n daemon script
- Date: 2020-06-05 03:08:10 UTC
- Revision ID: git-v1:a61c17c2517d7640357a1982c355585b79f5d674
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
