Viewing all changes in revision 506.
- Committer: l10n daemon script
- Date: 2021-07-23 01:17:00 UTC
- Revision ID: git-v1:eff6b709a08e4651e36412557330c53ca2e8548b
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
