]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb0a3c0) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 19 Apr 2022 01:48:03 +0000 (01:48 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 19 Apr 2022 01:48:03 +0000 (01:48 +0000)
commit0dfa3611de7a0292f1d61ad132328df8ac776b12
tree6f44bb1785244565a502c724f463286751cfe9a9tree
parentfb0a3c03a6d7f871f6a83b57830730921b1ffe7ccommit | 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/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history