diff options
| author | l10n daemon script <scripty@kde.org> | 2021-02-04 06:41:42 +0100 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-02-04 06:41:42 +0100 |
| commit | 68f8622dc9d40f9a8df7fa49680a109f7f924ddb (patch) | |
| tree | c19550e7b1ab0bee6b18a591c9c2ac9aec1611e3 /src/kconfig_compiler/KConfigSourceGenerator.cpp | |
| parent | 7766259eb5287d11d2ef60b50da9255b1307df3c (diff) | |
| download | kconfig-68f8622dc9d40f9a8df7fa49680a109f7f924ddb.tar.gz kconfig-68f8622dc9d40f9a8df7fa49680a109f7f924ddb.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/KConfigSourceGenerator.cpp')
0 files changed, 0 insertions, 0 deletions