Viewing all changes in revision 770.
- Committer: l10n daemon script
- Date: 2018-10-10 04:31:54 UTC
- Revision ID: git-v1:92ccbfbabbe88831ae5f9ff493baa2d406a4004c
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:
- levels/default_levels.dat
expand all
collapse all
added
removed
