diff options
| author | l10n daemon script <scripty@kde.org> | 2015-11-04 17:04:03 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-11-04 17:04:03 +0000 |
| commit | 12399c3558a124bb3ba7e782842889c50043454d (patch) | |
| tree | d92dec183df718bf3f42a77b52cd54e3c8e78f6c /autotests/kconfigtest.cpp | |
| parent | 19513e1910f19375a4c17a61f048c7f8c2f9e840 (diff) | |
| download | kconfig-12399c3558a124bb3ba7e782842889c50043454d.tar.gz kconfig-12399c3558a124bb3ba7e782842889c50043454d.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/kconfigtest.cpp')
0 files changed, 0 insertions, 0 deletions