]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3a54a36) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 28 Jun 2024 01:27:14 +0000 (01:27 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 28 Jun 2024 01:27:14 +0000 (01:27 +0000)
commit08347a59c0a442c42b6c97c692b6d4aabb2e70df
tree079bd612ebaee083b7d2109bf066e04564ff1d9dtree
parent3a54a369d9115fa66ed474c4eee3ef51b300db3ccommit | 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