Viewing all changes in revision 748.
- Committer: l10n daemon script
- Date: 2017-09-10 00:07:46 UTC
- Revision ID: git-v1:4163b01b2e51c8954d0b355ed29b04cee2f502c5
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
