diff options
| author | l10n daemon script <[email protected]> | 2025-06-15 01:33:49 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-15 01:33:49 +0000 |
| commit | 5c71e6189488ca3e3f28c45e274f67f77c7cdfed (patch) | |
| tree | e3c3bd10c83860a6c68e52a3ecfbc8f65318d1ab /src/main.cpp | |
| parent | 245ae05f8016c2cbf8cd877ca9ddf5d57ed236d9 (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/main.cpp')
0 files changed, 0 insertions, 0 deletions