Viewing all changes in revision 540.
- Committer: l10n daemon script
- Date: 2022-07-01 01:54:34 UTC
- Revision ID: git-v1:b9e4e3268f3c6c4c1bf0a8192fbc955119066c99
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
