Viewing all changes in revision 507.
- Committer: l10n daemon script
- Date: 2020-06-17 12:00:23 UTC
- Revision ID: git-v1:5f56c9b1e7e77805e90a3f270c506d6f1cf37e64
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
