Viewing all changes in revision 805.
- Committer: l10n daemon script
- Date: 2019-01-06 04:33:55 UTC
- Revision ID: git-v1:20a37bab5d9ceb4ddd918cb4c9c2d5199dd6c611
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:
- players/player1.desktop
expand all
collapse all
added
removed
