Viewing all changes in revision 618.
- Committer: l10n daemon script
- Date: 2020-04-22 04:22:26 UTC
- Revision ID: git-v1:9bf1282c6b17e681df71fcad06efd920399a44b4
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"
- files modified:
- books/ca.desktop
expand all
collapse all
added
removed
