Viewing all changes in revision 619.
- Committer: l10n daemon script
- Date: 2020-02-20 04:54:45 UTC
- Revision ID: git-v1:b17343a6b1ea58528618d2a152b6f172a89ba81e
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
