Viewing all changes in revision 835.
- Committer: l10n daemon script
- Date: 2020-04-06 04:07:00 UTC
- Revision ID: git-v1:445268cc4005a8550e5943a1cd1bdf0edfa55a11
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:
- arenas/clover.desktop
expand all
collapse all
added
removed
