]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6403ce2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 4 Nov 2023 12:00:15 +0000 (12:00 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 4 Nov 2023 12:00:15 +0000 (12:00 +0000)
commitd1f4e8d1e79814f6ddf56e56c7d121c9f1838b4e
tree0c23f56ad01ed6170514a2eae23a41d90e715ccftree
parent6403ce27ccd4ec420735d0348fdb603d69a2dd7bcommit | 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