diff options
| author | l10n daemon script <scripty@kde.org> | 2020-09-21 05:53:34 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-09-21 05:53:34 +0200 |
| commit | 21a40e05397f15aea066cabd36b9ada9d6ba412b (patch) | |
| tree | bd1a35830b1fe272c02f7d1a51f655d8afdd38ba /src/core/kconfigwatcher.cpp | |
| parent | f9079c8413e52071bacced70bf0394dd65f14ce3 (diff) | |
| download | kconfig-21a40e05397f15aea066cabd36b9ada9d6ba412b.tar.gz kconfig-21a40e05397f15aea066cabd36b9ada9d6ba412b.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/kconfigwatcher.cpp')
0 files changed, 0 insertions, 0 deletions