Viewing all changes in revision 190.
- Committer: l10n daemon script
- Date: 2024-06-28 02:26:54 UTC
- Revision ID: git-v1:ad565d8a676b2aaedb3b8d19222fb71e6d96a357
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"
- files modified:
- po_thumbnailer/pothumbnail.json
expand all
collapse all
added
removed
