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

Authored by l10n daemon script <scripty@kde.org> on Jan 10 2017, 11: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>

Jan 10 2017, 11:13 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/new_file_templates/HTMLFile.desktop
	M			src/new_file_templates/TextFile.desktop
	M			src/new_file_templates/linkPath.desktop
	M			src/new_file_templates/linkProgram.desktop
	M			src/new_file_templates/linkURL.desktop