]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5ef1136) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 6 Nov 2022 01:51:33 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 6 Nov 2022 01:51:33 +0000 (01:51 +0000)
commit4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a
tree6cc95efdd867c960936267a1c723349a3a3d138atree
parent5ef1136ea3362a6722b6f4da020d44513f690b31commit | diff
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"
src/dolphinpart.json.in diff | blob | blame | history
src/dolphinpartactions.desktop diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history