Viewing all changes in revision 608.
- Committer: l10n daemon script
- Date: 2020-02-04 05:06:26 UTC
- Revision ID: git-v1:715e8d7d17196a10edb927b17d3a16f0a5ac1ffc
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
