cloud.milkyroute.net Git - dolphin.git/commit

]> cloud.milkyroute.net Git - dolphin.git/commit

author	l10n daemon script <scripty@kde.org>
	Thu, 3 Sep 2020 04:10:45 +0000 (06:10 +0200)
committer	l10n daemon script <scripty@kde.org>
	Thu, 3 Sep 2020 04:10:45 +0000 (06:10 +0200)
commit	a1d5d75bea304aad11eb4ae08198f552e7f8f0a1
tree	e4a75d6715b1081995f1e4d76b2f7bd235e5c98c	tree
parent	745fdeece31af9d9b7a64a0ad8cfc04d1a759864	commit \| 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"

RSS Atom

src/dolphinpart.desktop		diff \| blob \| blame \| history
src/org.kde.dolphin.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphingeneral.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinnavigation.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinservices.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinviewmodes.desktop		diff \| blob \| blame \| history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop		diff \| blob \| blame \| history