diff options
| author | l10n daemon script <scripty@kde.org> | 2018-10-10 06:24:03 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2018-10-10 06:24:03 +0200 |
| commit | 27764485b4b91b909d5b47bf9b75567474031a98 (patch) | |
| tree | bf89c9d927cd1dbe8d86c19d2992c47d0326b45a /src/core/kconfig.cpp | |
| parent | cbd025fa00b97bb1908c848383d29b8f71cb4303 (diff) | |
| download | kconfig-27764485b4b91b909d5b47bf9b75567474031a98.tar.gz kconfig-27764485b4b91b909d5b47bf9b75567474031a98.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/kconfig.cpp')
0 files changed, 0 insertions, 0 deletions