diff options
| author | l10n daemon script <scripty@kde.org> | 2020-07-14 05:53:21 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-07-14 05:53:21 +0200 |
| commit | 538cf784734434e5478f7b3dab8af131304dd656 (patch) | |
| tree | 32ff222d2075f659ef169965db2399b2cdb858a5 /src/kconfig_compiler/KConfigHeaderGenerator.cpp | |
| parent | 2f7207fcaa9b228a777fd82908dbf28b9a32d090 (diff) | |
| download | kconfig-538cf784734434e5478f7b3dab8af131304dd656.tar.gz kconfig-538cf784734434e5478f7b3dab8af131304dd656.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/KConfigHeaderGenerator.cpp')
0 files changed, 0 insertions, 0 deletions