diff options
| author | l10n daemon script <[email protected]> | 2025-07-27 01:34:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-27 01:34:32 +0000 |
| commit | e48bb0405ec431cf9f6048981ca08d3dcfbeeba7 (patch) | |
| tree | 1f76d04766b3cb4e39ab4e7961c2fdd0aeec52db /CMakePresets.json | |
| parent | 13d212fa417ce811aa9778bafdaa025059ed373b (diff) | |
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"
Diffstat (limited to 'CMakePresets.json')
0 files changed, 0 insertions, 0 deletions