Viewing all changes in revision 3755.
- Committer: l10n daemon script
- Date: 2019-07-31 03:14:48 UTC
- Revision ID: git-v1:1283d71bd65ce7a0f22bb95fa01b0b7cfa2f5d95
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
