diff options
| author | l10n daemon script <[email protected]> | 2025-12-12 01:36:36 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-12-12 01:36:36 +0000 |
| commit | 69a98144f385dae4fcdd77fb1565364d3ab9079d (patch) | |
| tree | ebbf857893f1ed61284c68e516ec497fdc5393f3 /src/views/zoomlevelinfo.cpp | |
| parent | 59580237b843bbc6e72e548a4cc9cd510e819093 (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/views/zoomlevelinfo.cpp')
0 files changed, 0 insertions, 0 deletions