]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8cea3f2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 19 Jul 2024 01:21:28 +0000 (01:21 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 19 Jul 2024 01:21:28 +0000 (01:21 +0000)
commit8560c73e677186572a134ba427443924eeda9646
tree1aaeb534d42c0e4ab6c0d1c684ce89bf64597e71tree
parent8cea3f233687493640db9c10251ff1accd3d793ccommit | 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/itemactions/movetonewfolderitemaction.json diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history