diff options
| author | l10n daemon script <scripty@kde.org> | 2021-10-01 01:21:46 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-10-01 01:21:46 +0000 |
| commit | 1e42d79728f57197a8c70618ef48cc38b8c27ac7 (patch) | |
| tree | d38045731baf9fe8af270fdb4a312905f1a389c9 /CMakeLists.txt | |
| parent | 0c61fb56725a2cc042a03c21c7bee63a16a5e7fe (diff) | |
| download | kconfig-1e42d79728f57197a8c70618ef48cc38b8c27ac7.tar.gz kconfig-1e42d79728f57197a8c70618ef48cc38b8c27ac7.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 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions