summaryrefslogtreecommitdiff
path: root/src/session.ui
diff options
context:
space:
mode:
authorl10n daemon script <scripty@kde.org>2015-03-26 04:46:00 +0000
committerl10n daemon script <scripty@kde.org>2015-03-26 04:46:00 +0000
commit4c970221f8ba7506e96ae7655fee0c4c27768102 (patch)
tree1000d280087cffcfd6634867c04283e510e804be /src/session.ui
parentAdd missing colon (diff)
downloadrekonq-4c970221f8ba7506e96ae7655fee0c4c27768102.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/session.ui')
0 files changed, 0 insertions, 0 deletions