Viewing all changes in revision 57.
- Committer: l10n daemon script
- Date: 2021-03-27 05:13:29 UTC
- Revision ID: git-v1:b71f55340a37fe0432887879e7660af9b797befb
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.desktop
expand all
collapse all
added
removed
