]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: efff6a5) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 25 May 2024 01:19:17 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 25 May 2024 01:19:17 +0000 (01:19 +0000)
commit3fad514921f528145d4af3f921afaf3d1908a3cf
tree9a878947d65fae381e850078b110af694efaf9fbtree
parentefff6a57087754b76864721d27529b1aae63915ccommit | 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