Viewing all changes in revision 962.
- Committer: l10n daemon script
- Date: 2018-10-10 04:34:29 UTC
- Revision ID: git-v1:24270245f65c16c281adf2681f53cda3d634f09e
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.kreversi.desktop
expand all
collapse all
added
removed
