Viewing all changes in revision 611.
- Committer: l10n daemon script
- Date: 2020-01-28 04:50:56 UTC
- Revision ID: git-v1:684053bb4a97a630986b1b13a2d5a67100d884f3
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/gtkconfig.json
expand all
collapse all
added
removed
