Viewing all changes in revision 3738.
- Committer: l10n daemon script
- Date: 2019-06-03 03:27:33 UTC
- Revision ID: git-v1:7bd131bb4f954ac41ef09ce85d5789b7240fe2e6
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
