Viewing all changes in revision 3337.
- Committer: l10n daemon script
- Date: 2020-01-09 04:43:22 UTC
- Revision ID: git-v1:fe09d66e335ed8cd40ffcae89df4022d1f0a7a14
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
