diff options
| author | l10n daemon script <scripty@kde.org> | 2022-06-13 02:13:18 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-06-13 02:13:18 +0000 |
| commit | a83e1f5068b6558c25a1366386fd4d4554efef63 (patch) | |
| tree | d2faa575657f7c1f028fc5ab62d53fa0efe4941c /src/core/ksharedconfig.cpp | |
| parent | 41121e72d5662dc8005fc86261026406267947a2 (diff) | |
| download | kconfig-a83e1f5068b6558c25a1366386fd4d4554efef63.tar.gz kconfig-a83e1f5068b6558c25a1366386fd4d4554efef63.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/core/ksharedconfig.cpp')
0 files changed, 0 insertions, 0 deletions