« back to all changes in this revision
Viewing changes to layouts/arena.desktop
- Committer: l10n daemon script
- Date: 2019-02-16 04:41:13 UTC
- Revision ID: git-v1:6cfce896dcf7422c3beac124ea5f2e23885a466e
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:
- layouts/arena.desktop
added
removed
layouts/arena.desktop
