Viewing all changes in revision 1242.
- Committer: l10n daemon script
- Date: 2019-02-18 04:20:37 UTC
- Revision ID: git-v1:0f14fe477a46777f84206b13603b3033ee50a06a
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
