Viewing all changes in revision 3321.
- Committer: l10n daemon script
- Date: 2019-11-16 04:00:37 UTC
- Revision ID: git-v1:1f79e749906f6784cda90af935023a84b3bce118
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:
- plugins/wiktionary/wiktionary_sound.desktop
expand all
collapse all
added
removed
