Viewing all changes in revision 3779.
- Committer: l10n daemon script
- Date: 2020-04-04 04:31:21 UTC
- Revision ID: git-v1:eb9e8a8f254a578499df4c00d8b833577fa716ec
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.kajongg.desktop
expand all
collapse all
added
removed
