Viewing all changes in revision 691.
- Committer: l10n daemon script
- Date: 2018-09-22 04:05:21 UTC
- Revision ID: git-v1:7f171c0f1e2fe8a6a9b7228494b6bd891638c12f
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
