Viewing all changes in revision 1482.
- Committer: l10n daemon script
- Date: 2019-07-24 03:37:38 UTC
- Revision ID: git-v1:3e24ba47b172237f2e1e3009d8381b2e423e28f4
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/otr/kcm_ktp_chat_otr.desktop
expand all
collapse all
added
removed
