diff options
| author | l10n daemon script <scripty@kde.org> | 2022-03-29 01:59:41 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-03-29 01:59:41 +0000 |
| commit | 66c8a3b8858584724bbde65077b1e2dbe9200bac (patch) | |
| tree | 8609769d46fb4ac33e1df2ab1a09f4bf9ad037a6 /autotests/test_kconfigutils.cpp | |
| parent | 718459dd6bed63b1460a061aefa5c8cc6c4efb3a (diff) | |
| download | kconfig-66c8a3b8858584724bbde65077b1e2dbe9200bac.tar.gz kconfig-66c8a3b8858584724bbde65077b1e2dbe9200bac.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 'autotests/test_kconfigutils.cpp')
0 files changed, 0 insertions, 0 deletions