]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f885d2f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 12 Feb 2023 02:02:18 +0000 (02:02 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 12 Feb 2023 02:02:18 +0000 (02:02 +0000)
commitd185e218871f7fb8016291994564bf266dd5df70
tree49ffdd0e941e5d07b1def7dd1d6a09fe436bad84tree
parentf885d2f1be6c52be33008f4afe95291d82c3618fcommit | 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