Viewing all changes in revision 1459.
- Committer: l10n daemon script
- Date: 2018-01-01 03:51:03 UTC
- Revision ID: git-v1:760285558d1caf63046d6327992b3448a6d40716
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
