summaryrefslogtreecommitdiff
path: root/config-qtoauth.h.cmake
diff options
context:
space:
mode:
authorl10n daemon script <scripty@kde.org>2018-12-29 02:47:52 +0100
committerl10n daemon script <scripty@kde.org>2018-12-29 02:47:52 +0100
commite56d15ec6ae10b3595410473d4650cb241e4d84d (patch)
tree209db783d3c1f3ad4c88a810ab0306de54726cb4 /config-qtoauth.h.cmake
parentUpdate links using new Phabricator address scheme (diff)
downloadrekonq-e56d15ec6ae10b3595410473d4650cb241e4d84d.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 'config-qtoauth.h.cmake')
0 files changed, 0 insertions, 0 deletions