diff options
| author | l10n daemon script <scripty@kde.org> | 2021-11-29 01:30:30 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-11-29 01:30:30 +0000 |
| commit | 594e62461f2f3b22dffda7470124de32125b6ed6 (patch) | |
| tree | a412fbc426e02dcae17586706ffa46d1c69c4ed9 /src/kconfig_compiler/KConfigCodeGeneratorBase.cpp | |
| parent | 973dfd484024f7248cff51ded0efc13e4d554f59 (diff) | |
| download | kconfig-594e62461f2f3b22dffda7470124de32125b6ed6.tar.gz kconfig-594e62461f2f3b22dffda7470124de32125b6ed6.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/KConfigCodeGeneratorBase.cpp')
0 files changed, 0 insertions, 0 deletions