diff options
| author | l10n daemon script <scripty@kde.org> | 2022-07-01 01:42:24 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-07-01 01:42:24 +0000 |
| commit | a0ee952c73f573df37556c68081e4ef1860eef51 (patch) | |
| tree | dc5f233631ae4c68fae1c433611d9d43e7c7c723 /autotests/ksharedconfig_in_global_object.cpp | |
| parent | 5ce3f9eb1fd2c83754d94f568ba00335e3d184f3 (diff) | |
| download | kconfig-a0ee952c73f573df37556c68081e4ef1860eef51.tar.gz kconfig-a0ee952c73f573df37556c68081e4ef1860eef51.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/ksharedconfig_in_global_object.cpp')
0 files changed, 0 insertions, 0 deletions