Viewing all changes in revision 579.
- Committer: l10n daemon script
- Date: 2019-11-18 04:25:03 UTC
- Revision ID: git-v1:f106a9cc119d10c2a34dc5360c89f19c6dd0f667
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
