Viewing all changes in revision 1300.
- Committer: l10n daemon script
- Date: 2020-07-23 04:00:35 UTC
- Revision ID: git-v1:775eb83a11a811d715657a8e5c39d1a7e78b82e2
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:
- tutorial.kolf
expand all
collapse all
added
removed
