Viewing all changes in revision 169.
- Committer: l10n daemon script
- Date: 2019-07-15 03:06:27 UTC
- Revision ID: git-v1:ab1e260e6232c38bd3d89037c7e2e974554b06c1
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
