Viewing all changes in revision 207.
- Committer: l10n daemon script
- Date: 2021-07-27 01:19:47 UTC
- Revision ID: git-v1:f937de86faa0023f0f0fe3fc70b34dca3c231fbd
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
