Viewing all changes in revision 200.
- Committer: l10n daemon script
- Date: 2020-03-27 05:31:39 UTC
- Revision ID: git-v1:a0e44348ba1730d228993c42e3da92a4c382b212
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:
- blend/blenderthumbnail.desktop
expand all
collapse all
added
removed
