Viewing all changes in revision 192.
- Committer: l10n daemon script
- Date: 2024-08-28 02:28:45 UTC
- Revision ID: git-v1:078d5a11c4f78749c3bb271dcb1d08a056c155f4
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
