Viewing all changes in revision 3753.
- Committer: l10n daemon script
- Date: 2019-07-21 03:17:53 UTC
- Revision ID: git-v1:d5857d77ea63cffbf70dccd8437f749030d4773a
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
