]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dccd8c4) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 2 Jan 2023 02:34:18 +0000 (02:34 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 2 Jan 2023 02:34:18 +0000 (02:34 +0000)
commitd11d4781487243dddc3a3899bd65d21542a93383
treee4221185daeb79c8b8c944576bbc6ce5c6ebdcdetree
parentdccd8c4899e2811960f60c825ddf433ce174b372commit | 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/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