diff options
| author | l10n daemon script <scripty@kde.org> | 2017-07-07 04:33:03 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2017-07-07 04:33:03 +0200 |
| commit | 0664e644d6aed666a2465ecb5f3eb852d6fdc6b8 (patch) | |
| tree | 39c6cb5a96afd0578705f6914665617587ebdb46 /src/gui/kstandardshortcut.cpp | |
| parent | 93df9b57812f9e2aaf84a70a8adf84787a9a62ea (diff) | |
| download | kconfig-0664e644d6aed666a2465ecb5f3eb852d6fdc6b8.tar.gz kconfig-0664e644d6aed666a2465ecb5f3eb852d6fdc6b8.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