summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorl10n daemon script <scripty@kde.org>2018-12-29 12:21:14 +0100
committerl10n daemon script <scripty@kde.org>2018-12-29 12:21:14 +0100
commitff206e0867834a2df703c5b2ce57efd9fdf85b90 (patch)
treecc0b2d30729490927b688fa1888622d51f14efae /doc
parentSVN_SILENT made messages (.desktop file) - always resolve ours (diff)
downloadrekonq-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 'doc')
0 files changed, 0 insertions, 0 deletions