Viewing all changes in revision 617.
- Committer: l10n daemon script
- Date: 2020-02-16 04:55:54 UTC
- Revision ID: git-v1:17409f9c0b85a8c009688292f7a1d56ebc637f44
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
