« back to all changes in this revision
Viewing changes to arenas/clanbomber_Blast_Matrix.desktop
- Committer: l10n daemon script
- Date: 2020-06-18 03:32:42 UTC
- Revision ID: git-v1:fb2651b982ad44826ba88c153bc445c3eef1a6cb
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:
- arenas/clanbomber_Arena.desktop
added
removed
arenas/clanbomber_Blast_Matrix.desktop
