]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5644e08) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 7 Nov 2023 03:15:28 +0000 (03:15 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 7 Nov 2023 03:15:28 +0000 (03:15 +0000)
commitd558c9a5dd8082488ea884feece22c1add1ea6cd
tree4d6e0d79627ace2f475fad8d9b92cb8b5a356dc2tree
parent5644e08579963e63443a3d62d44b885b992c35b3commit | 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/kcmdolphinviewmodes.json diff | blob | blame | history