Viewing all changes in revision 330.
- Committer: l10n daemon script
- Date: 2020-06-17 11:55:38 UTC
- Revision ID: git-v1:b264db65b664b41f2f01997b2b5fc03c7c9a97f3
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:
- kmousetool/org.kde.kmousetool.desktop
expand all
collapse all
added
removed
