]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0fc218f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 15 May 2022 01:59:30 +0000 (01:59 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 15 May 2022 01:59:30 +0000 (01:59 +0000)
commit2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d
tree20e951aa8bab3ab154e47f2da7b8786c3341aba0tree
parent0fc218fd264adf0f67396409cdd1d44265c71f07commit | 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/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