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

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

author	l10n daemon script <scripty@kde.org>
	Sat, 13 Jun 2020 03:34:06 +0000 (05:34 +0200)
committer	l10n daemon script <scripty@kde.org>
	Sat, 13 Jun 2020 03:34:06 +0000 (05:34 +0200)
commit	799c532d239c2c04cb7fe5014aceba449268fd3d
tree	48493d409c5b2d623e4b2bb1e470a00e61369737	tree
parent	85f5156a332c5e2e38facf390dafd6a1fdf1c9a2	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