Viewing all changes in revision 191.
- Committer: l10n daemon script
- Date: 2019-12-07 04:31:19 UTC
- Revision ID: git-v1:b0a53f30c695f24b11bb9a8d5423adeb2bba674e
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
