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

Authored by l10n daemon script <scripty@kde.org> on Aug 6 2017, 4:05 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>

Aug 6 2017, 4:05 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			lib/kdev4-php/app_templates/simple_phpapp/simple_phpapp.kdevtemplate
	M			lib/kdev4-php/kdevphpsupport.desktop.cmake
	M			lib/kdev4-php/testprovider/kdevphpunitprovider.desktop.cmake