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

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

Parents

Branches

Unknown

Tags

Unknown

References

refs/keep-around/fada19f1778fd793128b2b9f043f75dcc512cea5

				Path	Packages
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop