Viewing all changes in revision 188.
- Committer: l10n daemon script
- Date: 2020-12-21 05:36:43 UTC
- Revision ID: git-v1:46e4724a240b3d64f558fcd33d524d8b302d5587
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:
- org.kde.kcolorchooser.desktop
expand all
collapse all
added
removed
