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

Authored by l10n daemon script <scripty@kde.org> on Aug 28 2017, 2:30 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 28 2017, 2:30 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/eyeonscreen/package/metadata.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwincompositing/kwineffect.knsrc
	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/kwinscreenedges/kwintouchscreen.desktop
	M			kcmkwin/kwinscripts/kwinscripts.knsrc
	M			kcmkwin/kwintabbox/kwinswitcher.knsrc
	M			kcmkwin/kwintabbox/kwintabbox.desktop
	M			kwin.notifyrc
	M			packageplugins/decoration/kwin-packagestructure-decoration.desktop
	M			packageplugins/scripts/kwin-packagestructure-scripts.desktop
	M			packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
	M			plugins/kdecorations/aurorae/src/kwindecoration.desktop