Viewing all changes in revision 629.
- Committer: l10n daemon script
- Date: 2020-10-18 04:01:24 UTC
- Revision ID: git-v1:e6368155d1dd2ca753182c8adde8881b6b4f0381
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
