diff options
| author | l10n daemon script <scripty@kde.org> | 2022-05-28 02:04:31 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-05-28 02:04:31 +0000 |
| commit | 5a01d0c0c14b66db121c8eeb2332f352b843f8da (patch) | |
| tree | 2444d54f32570a5dd53c923fd9803bebe961858a /src/gui/kstandardshortcut.cpp | |
| parent | aafd381fa35acbe1d9625029ba134cbfadf10590 (diff) | |
| download | kconfig-5a01d0c0c14b66db121c8eeb2332f352b843f8da.tar.gz kconfig-5a01d0c0c14b66db121c8eeb2332f352b843f8da.tar.bz2 | |
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/gui/kstandardshortcut.cpp')
0 files changed, 0 insertions, 0 deletions