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

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

author	l10n daemon script <scripty@kde.org>
	Mon, 11 Nov 2019 08:42:43 +0000 (09:42 +0100)
committer	l10n daemon script <scripty@kde.org>
	Mon, 11 Nov 2019 08:42:43 +0000 (09:42 +0100)
commit	3984e607bb4437a38af16e007f1c23fbcff7dfb2
tree	3f19b3d4d36c0f3eed6d827b771dcde9842bc63c	tree
parent	d8f9ca49d333540796713a8842a1bea7622d0444	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