]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5797371) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 28 Aug 2024 01:32:24 +0000 (01:32 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 28 Aug 2024 01:32:24 +0000 (01:32 +0000)
commit6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5
tree387b08a9a802cd34a58d248004c52b54a5c9b499tree
parent5797371c789f8814b2310b2ee659724d10a413c2commit | 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