]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85083b2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 22 May 2022 01:44:35 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 22 May 2022 01:44:35 +0000 (01:44 +0000)
commit30b62a1c042c150daa5700bbd86bb14df80b7744
tree127fc64873850ef2dce86b785c48c3111c9dba68tree
parent85083b209c5ac58be5e4b0a35dee54a5085a074ccommit | 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/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