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

Authored by l10n daemon script <scripty@kde.org> on Jun 3 2019, 3:21 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>

Jun 3 2019, 3:21 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/libs/kernel/plan_schedulerplugin.desktop
	M			src/org.kde.calligraplan.desktop
	M			src/planpart.desktop
	M			src/plugins/schedulers/rcps/planrcpsscheduler.desktop
	M			src/templates/Simple/Basicproject.desktop
	M			src/workpackage/org.kde.calligraplanwork.desktop
	M			src/workpackage/planworkpart.desktop