diff options
| author | l10n daemon script <scripty@kde.org> | 2020-06-18 05:30:19 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-06-18 05:30:19 +0200 |
| commit | 56a44a5de2e2bbb0041d6cd56575969cc254160c (patch) | |
| tree | 40ab47b1e1406100d9c8f82d20760a8a23283287 /src/gui/kstandardshortcut.cpp | |
| parent | 27882eb23d0a0ecfdd4e2d06120ef3c047c733f3 (diff) | |
| download | kconfig-56a44a5de2e2bbb0041d6cd56575969cc254160c.tar.gz kconfig-56a44a5de2e2bbb0041d6cd56575969cc254160c.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