« back to all changes in this revision
Viewing changes to books/ca.desktop
- Committer: l10n daemon script
- Date: 2020-07-18 03:35:56 UTC
- Revision ID: git-v1:2d105050a1f56a2949fe5ad946ebf1f7848c7fff
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
added
removed
books/ca.desktop
