Viewing all changes in revision 768.
- Committer: l10n daemon script
- Date: 2019-02-22 04:37:00 UTC
- Revision ID: git-v1:0cf9c7415e9edb6f11b225b6480bdea8247a5c44
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
expand all
collapse all
added
removed
