Viewing all changes in revision 1485.
- Committer: l10n daemon script
- Date: 2020-01-12 04:55:45 UTC
- Revision ID: git-v1:d7ee4bed0f85e432aec5d2749ec5e67bbd11d2db
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:
- config/behavior/kcm_ktp_chat_behavior.desktop
expand all
collapse all
added
removed
