Viewing all changes in revision 3136.
- Committer: l10n daemon script
- Date: 2020-04-04 04:20:05 UTC
- Revision ID: git-v1:9ed8580b0cabdcc5f4b3aff9baa0821b99700916
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
