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

Authored by l10n daemon script <scripty@kde.org> on Apr 6 2019, 4:06 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>

Apr 6 2019, 4:06 AM

Parents

R108:3cc39ba35eb2: Fix plugins/qpa build with Qt 5.13

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/translucency/package/metadata.desktop
	M			kcmkwin/kwineffects/kcm_kwin_effects.desktop
	M			kcmkwin/kwinoptions/kwinmoving.desktop
	M			kcmkwin/kwinscreenedges/kwinscreenedges.desktop
	M			kcmkwin/kwinscreenedges/kwintouchscreen.desktop