Viewing all changes in revision 631.
- Committer: l10n daemon script
- Date: 2020-11-11 05:45:31 UTC
- Revision ID: git-v1:07999489eb42c58c1604f05eb2215259582ace89
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
