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

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

Jul 24 2019, 3:27 AM

Parents

R71:511d99b7745a: Fix build with Qt 5.13

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/formeditor/widgetfactory.desktop
	M			src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
	M			src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop
	M			src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json