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 04:17:33 +0000 (05:17 +0100)
committer	l10n daemon script <scripty@kde.org>
	Mon, 11 Nov 2019 04:17:33 +0000 (05:17 +0100)
commit	b9a2df09fcb5f7e1e62b742d32e961437a988da8
tree	e3d2cdbdd9f54be9fb30aadd4715aad08787ba93	tree
parent	4c81a78bae9ed8f927334f6b1f0475dc9159cba7	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