diff options
| author | l10n daemon script <scripty@kde.org> | 2018-12-29 12:21:14 +0100 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2018-12-29 12:21:14 +0100 |
| commit | ff206e0867834a2df703c5b2ce57efd9fdf85b90 (patch) | |
| tree | cc0b2d30729490927b688fa1888622d51f14efae /src/download/downloadmanager.cpp | |
| parent | SVN_SILENT made messages (.desktop file) - always resolve ours (diff) | |
| download | rekonq-ff206e0867834a2df703c5b2ce57efd9fdf85b90.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/download/downloadmanager.cpp')
0 files changed, 0 insertions, 0 deletions