Viewing all changes in revision 836.
- Committer: l10n daemon script
- Date: 2021-01-04 05:31:12 UTC
- Revision ID: git-v1:97a7269e04860af523cc5b130fc1d28a07cb54fc
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
