Viewing all changes in revision 361.
- Committer: l10n daemon script
- Date: 2019-09-27 03:22:19 UTC
- Revision ID: git-v1:1fe2845a05e35211bd68a66616cc74c54661943a
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"
expand all
collapse all
added
removed
