Viewing all changes in revision 2006.
- Committer: l10n daemon script
- Date: 2020-07-29 03:58:24 UTC
- Revision ID: git-v1:481b66c41c7377df08b24ff481a90f7502e21b27
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
