Viewing all changes in revision 636.
- Committer: l10n daemon script
- Date: 2023-08-12 01:40:00 UTC
- Revision ID: git-v1:7f2ea6d0a00a871b62ce68e38879980d09fe71f4
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
