Viewing all changes in revision 1590.
- Committer: l10n daemon script
- Date: 2019-07-31 03:11:23 UTC
- Revision ID: git-v1:09c1ae34b6c13a29c4b051430b38870ffd572aff
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:
- src/kioslaves/kded/baloosearchmodule.desktop
expand all
collapse all
added
removed
