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

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

author	l10n daemon script <scripty@kde.org>
	Sat, 14 Dec 2024 01:47:37 +0000 (01:47 +0000)
committer	l10n daemon script <scripty@kde.org>
	Sat, 14 Dec 2024 01:47:37 +0000 (01:47 +0000)
commit	517cc98e1574fdff4944f256d14ff10543b7c718
tree	224448128f592008e0fbbebf42760f4e3c7a354c	tree
parent	81062df1158e62b7ed65fd81ef55a190637c4c8a	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.json.in		diff \| blob \| blame \| history
src/dolphinpartactions.desktop		diff \| blob \| blame \| history
src/itemactions/movetonewfolderitemaction.json		diff \| blob \| blame \| history
src/org.kde.dolphin.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphingeneral.json		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinviewmodes.json		diff \| blob \| blame \| history