diff options
| author | l10n daemon script <[email protected]> | 2025-06-22 01:35:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-22 01:35:32 +0000 |
| commit | 9f233850beb60168e8773623e0b5ae052c5287e9 (patch) | |
| tree | 3b54b4aaed4f493f3657d565627a155ca60c8813 /src/global.cpp | |
| parent | e57f6215659ee36877c7c36c9e3fcba0ba5d03a0 (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 'src/global.cpp')
0 files changed, 0 insertions, 0 deletions