diff options
| author | l10n daemon script <scripty@kde.org> | 2020-06-17 13:58:15 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-06-17 13:58:15 +0200 |
| commit | 27882eb23d0a0ecfdd4e2d06120ef3c047c733f3 (patch) | |
| tree | e73956e18b9569b154cf0020c277bdb1129c509c /src/kconfig_compiler/KConfigXmlParser.cpp | |
| parent | 6344c2fccf1512d10e640fdf433959ad3dfec36c (diff) | |
| download | kconfig-27882eb23d0a0ecfdd4e2d06120ef3c047c733f3.tar.gz kconfig-27882eb23d0a0ecfdd4e2d06120ef3c047c733f3.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/kconfig_compiler/KConfigXmlParser.cpp')
0 files changed, 0 insertions, 0 deletions