diff options
| author | l10n daemon script <scripty@kde.org> | 2016-01-20 12:41:24 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2016-01-20 12:41:24 +0000 |
| commit | 2639e721ee40817a731f551f4d27a475db073245 (patch) | |
| tree | 2bce552f98aa3bf9546db3ce90a4c2265d995456 /autotests/kconfig_compiler/test_dpointer_main.cpp | |
| parent | 83fbb89d727d897f3c9e720efc1dc8eb21639cb1 (diff) | |
| download | kconfig-2639e721ee40817a731f551f4d27a475db073245.tar.gz kconfig-2639e721ee40817a731f551f4d27a475db073245.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/test_dpointer_main.cpp')
0 files changed, 0 insertions, 0 deletions