Viewing all changes in revision 145.
- Committer: l10n daemon script
- Date: 2023-11-19 01:18:29 UTC
- Revision ID: git-v1:99f95e35a62562aae2794e2b2cd6c67636e1508a
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
