]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 09f25ee) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 26 Mar 2023 01:45:57 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 26 Mar 2023 01:45:57 +0000 (01:45 +0000)
commit080572c67a3eb02288886c7fc8a170ae8f151d97
treed6e08aace9441bb186cfadd185ac94f8d5b1fa7ftree
parent09f25ee461e4381c663aad4bd74928b8ee64f699commit | 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/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history