diff options
| author | l10n daemon script <scripty@kde.org> | 2018-08-26 05:37:52 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2018-08-26 05:37:52 +0200 |
| commit | ae1da3f99e349619143ac3cdb3e0d91b84e3efab (patch) | |
| tree | da8f1bf975651163fa08350e10c17ab1b85c6e02 /autotests/kdesktopfiletest.cpp | |
| parent | 1bf473224a0b8c762c3fc87f0560421023c3f27e (diff) | |
| download | kconfig-ae1da3f99e349619143ac3cdb3e0d91b84e3efab.tar.gz kconfig-ae1da3f99e349619143ac3cdb3e0d91b84e3efab.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/kdesktopfiletest.cpp')
0 files changed, 0 insertions, 0 deletions