Viewing all changes in revision 1491.
- Committer: l10n daemon script
- Date: 2020-04-06 04:10:31 UTC
- Revision ID: git-v1:41eab20b4acef9bcce3370cc8d43df0e36be01dd
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
