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

Authored by l10n daemon script <scripty@kde.org> on Nov 4 2016, 9:48 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>

Nov 4 2016, 9:48 AM

Parents

R108:f17d06ee7d42: Merge branch 'Plasma/5.8'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/morphingpopups/package/metadata.desktop
	M			kcmkwin/kwincompositing/kcmkwineffects.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			plugins/platforms/drm/drm.json
	M			plugins/platforms/fbdev/fbdev.json
	M			plugins/platforms/hwcomposer/hwcomposer.json
	M			plugins/platforms/virtual/virtual.json
	M			plugins/platforms/wayland/wayland.json
	M			plugins/platforms/x11/standalone/x11.json
	M			plugins/platforms/x11/windowed/x11.json