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

Authored by l10n daemon script <scripty@kde.org> on Mar 17 2018, 4:09 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>

Mar 17 2018, 4:09 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.desktop
	M			shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop
	M			wallpapers/color/metadata.desktop
	M			wallpapers/image/imagepackage/metadata.desktop
	M			wallpapers/image/slideshowpackage/metadata.desktop
	M			wallpapers/image/wallpaper.knsrc