diff options
| author | l10n daemon script <scripty@kde.org> | 2015-04-03 04:40:59 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-04-03 04:40:59 +0000 |
| commit | 9af0b91fadd6517e48b34bafeb1ce5459ef0369b (patch) | |
| tree | 42cf1cccdfab1b818466bed389bb784deed5db65 /src/sync/syncmanager.cpp | |
| parent | SVN_SILENT made messages (.desktop file) - always resolve ours (diff) | |
| download | rekonq-9af0b91fadd6517e48b34bafeb1ce5459ef0369b.tar.xz | |
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/sync/syncmanager.cpp')
0 files changed, 0 insertions, 0 deletions