diff options
| author | l10n daemon script <scripty@kde.org> | 2019-08-14 05:06:10 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2019-08-14 05:06:10 +0200 |
| commit | 2de9e4fc165bcadd54f81b7d17904c45632705f5 (patch) | |
| tree | 9d476796a3f4dd530900086eb1ee2f56ec3d57eb /src/core/kconfigwatcher.cpp | |
| parent | 1c977c11cdde06c08d25e9846018a2312b91694c (diff) | |
| download | kconfig-2de9e4fc165bcadd54f81b7d17904c45632705f5.tar.gz kconfig-2de9e4fc165bcadd54f81b7d17904c45632705f5.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