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

Authored by l10n daemon script <scripty@kde.org> on Oct 28 2019, 4:17 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>

Oct 28 2019, 4:17 AM

Parents

R53:e23fa8f15af8: Initial Python 3.8 support.

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app_templates/django_project/django_project.kdevtemplate
	M			app_templates/qtdesigner_app/qtdesigner_app.kdevtemplate
	M			app_templates/simple_pythonapp/simple_pythonapp.kdevtemplate