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

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

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.desktop
	M			plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop
	M			src/services/k3b_create_data_project.desktop
	M			src/services/k3b_create_data_project_from_blank_medium.desktop