Viewing all changes in revision 321.
- Committer: l10n daemon script
- Date: 2016-12-20 12:31:22 UTC
- Revision ID: git-v1:19ccae1ecfecb1264d455f104806599ddb3fba9e
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
