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

Authored by l10n daemon script <scripty@kde.org> on Dec 13 2016, 4:42 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>

Dec 13 2016, 4:42 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/eyeonscreen/package/metadata.desktop
	M			effects/fade/package/metadata.desktop
	M			effects/fadedesktop/package/metadata.desktop
	M			effects/flipswitch/flipswitch_config.desktop
	M			effects/glide/glide_config.desktop
	M			effects/maximize/package/metadata.desktop
	M			effects/morphingpopups/package/metadata.desktop
	M			effects/windowaperture/package/metadata.desktop
	M			kcmkwin/kwincompositing/kcmkwineffects.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwindecoration/kwindecoration.desktop
	M			kcmkwin/kwindesktop/desktop.desktop
	M			kcmkwin/kwinoptions/kwinactions.desktop
	M			kcmkwin/kwinoptions/kwinadvanced.desktop
	M			kcmkwin/kwinoptions/kwinfocus.desktop
	M			kcmkwin/kwinoptions/kwinmoving.desktop
	M			kcmkwin/kwinoptions/kwinoptions.desktop
	M			kcmkwin/kwinrules/kwinrules.desktop
	M			kcmkwin/kwinscreenedges/kwinscreenedges.desktop
	M			kcmkwin/kwintabbox/kwintabbox.desktop
	M			scripts/enforcedeco/metadata.desktop
	M			scripts/minimizeall/metadata.desktop