diff options
| author | l10n daemon script <scripty@kde.org> | 2021-12-15 01:48:33 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-12-15 01:48:33 +0000 |
| commit | eeefdf8aeabd875829ae6beee0e301a88c7da7c8 (patch) | |
| tree | 5a5e32b97cec413d3da886c7be6646c34c450d96 /autotests/kconfig_compiler/test_state_config_main.cpp | |
| parent | 9c81af25b184476e3945073415c0844d09a9e696 (diff) | |
| download | kconfig-eeefdf8aeabd875829ae6beee0e301a88c7da7c8.tar.gz kconfig-eeefdf8aeabd875829ae6beee0e301a88c7da7c8.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/kconfig_compiler/test_state_config_main.cpp')
0 files changed, 0 insertions, 0 deletions