Viewing all changes in revision 841.
- Committer: l10n daemon script
- Date: 2021-01-21 05:54:45 UTC
- Revision ID: git-v1:a43f8b41c2983ffd4e4bd676994147aef125f6e3
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.desktop.in
expand all
collapse all
added
removed
