Viewing all changes in revision 262.
- Committer: l10n daemon script
- Date: 2022-06-07 02:04:41 UTC
- Revision ID: git-v1:213f8b56162a7c464a8fd8998d2b8ebcffea1a6b
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
