Viewing all changes in revision 1220.
- Committer: l10n daemon script
- Date: 2019-01-01 04:26:59 UTC
- Revision ID: git-v1:7c3298bf049d9f6324bedc5e56fd8bf70918e568
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
