Viewing all changes in revision 1225.
- Committer: l10n daemon script
- Date: 2024-09-15 01:23:20 UTC
- Revision ID: git-v1:c0b0fecf19b85c235fcd413b3dde9d9200a55b1a
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:
- misc/dragonplayer_part.json.in
expand all
collapse all
added
removed
