diff options
| author | l10n daemon script <scripty@kde.org> | 2018-04-06 05:23:56 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2018-04-06 05:23:56 +0200 |
| commit | 9c8785b130b13573229f3791f8165200f9e2c037 (patch) | |
| tree | 1d289837f0ae17b9bed86721c46b504687fabee3 /autotests/kconfig_compiler/test5.cpp.ref | |
| parent | 6cfd982a582961f8b5b44ac13f720a850d2544bc (diff) | |
| download | kconfig-9c8785b130b13573229f3791f8165200f9e2c037.tar.gz kconfig-9c8785b130b13573229f3791f8165200f9e2c037.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/kconfig_compiler/test5.cpp.ref')
0 files changed, 0 insertions, 0 deletions