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

Authored by l10n daemon script <scripty@kde.org> on Jun 17 2020, 5:48 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 17 2020, 5:48 AM

Parents

Branches

Unknown

Tags

Unknown

References

refs/keep-around/b65ee71da65b87072d6f54c36640ee5609fc2079

				Path	Packages
	M			krita/data/templates/animation/.directory
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_docker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop