SVN_SILENT made messages (.desktop file) - always resolve ours
070bf55080da
Actions

Authored by l10n daemon script <scripty@kde.org> on Nov 18 2019, 7:56 AM.

Description

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"

Committed

l10n daemon script <scripty@kde.org>

Nov 18 2019, 7:56 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/libs/kernel/plan_schedulerplugin.desktop
	M			src/plan_viewplugin.desktop
	M			src/plugins/filters/kplato/import/plan_kplato_import.desktop
	M			src/plugins/schedulers/rcps/planrcpsscheduler.desktop
	M			src/plugins/schedulers/tj/plantjscheduler.desktop
	M			src/workpackage/org.kde.calligraplanwork.desktop