diff options
| author | l10n daemon script <[email protected]> | 2024-08-26 01:23:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-26 01:23:13 +0000 |
| commit | 310c2c5a941c8b0112204305bb374497ad476976 (patch) | |
| tree | 8d2e5bd94cfa7086370e6b56f942fe6348120718 /src/settings/settingspagebase.cpp | |
| parent | f8a2960b368217272e8d6c697769fdeefceb323a (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/settings/settingspagebase.cpp')
0 files changed, 0 insertions, 0 deletions