Viewing all changes in revision 233.
- Committer: l10n daemon script
- Date: 2022-02-27 01:51:09 UTC
- Revision ID: git-v1:7f9f2b75c7dfc27852f5efcaabe5f34805721933
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
