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

Authored by l10n daemon script <scripty@kde.org> on Sep 4 2017, 2:35 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>

Sep 4 2017, 2:35 AM

Parents

R7:d2b1ea61d385: Merge branch '1.7'

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R7:e47516d9e755: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 4 2017, 2:35 AM

				Path	Packages
	M			data/images/nickicons/christmas/index.desktop
	M			data/images/nickicons/classic/index.desktop
	M			data/images/nickicons/default/index.desktop
	M			data/images/nickicons/oxygen/index.desktop
	M			data/images/nickicons/simplistic/index.desktop
	M			data/images/nickicons/smiling/index.desktop
	M			data/images/nickicons/square/index.desktop
	M			data/konversation.notifyrc