diff options
| author | l10n daemon script <scripty@kde.org> | 2016-12-21 05:46:48 +0100 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2016-12-21 05:46:48 +0100 |
| commit | 9d5b64f16243d14e27402be23224f08cd8420bbe (patch) | |
| tree | 4001eb39e3cca737bfb7db6e2ca25a4a7e9a47f8 /src/core/kconfiggroup.h | |
| parent | f86f153a8050c9337e0f6c7b84171f50474df3b1 (diff) | |
| download | kconfig-9d5b64f16243d14e27402be23224f08cd8420bbe.tar.gz kconfig-9d5b64f16243d14e27402be23224f08cd8420bbe.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/kconfiggroup.h')
0 files changed, 0 insertions, 0 deletions