Viewing all changes in revision 529.
- Committer: l10n daemon script
- Date: 2019-01-05 04:43:41 UTC
- Revision ID: git-v1:76594778621a6cff0bffd04fec16c641e10fd7a2
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:
- kded/kscreen.desktop.cmake
expand all
collapse all
added
removed
