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

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

author	l10n daemon script <scripty@kde.org>
	Mon, 30 Apr 2018 05:09:04 +0000 (07:09 +0200)
committer	l10n daemon script <scripty@kde.org>
	Mon, 30 Apr 2018 05:09:04 +0000 (07:09 +0200)
commit	94ba6a0978fe03bcd51a37cd252b1ff2a9efe090
tree	93e4f79346cd98d66b7cbe05b1c4fed55df0f7ac	tree
parent	c270f4713691e6918054b4bb294e1016cedfbdbe	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