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

Authored by l10n daemon script <scripty@kde.org> on Sep 17 2019, 3:29 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"

Details

Committed

l10n daemon script <scripty@kde.org>

Sep 17 2019, 3:29 AM

Parents

R108:9d83a4d3654d: Delete unused forward declaration of Client class

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R108:fd702c3644f7: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 17 2019, 3:29 AM

Changes (36)

				Path	Packages
	M			effects/blur/blur_config.desktop
	M			effects/coverswitch/coverswitch_config.desktop
	M			effects/cube/cube_config.desktop
	M			effects/cubeslide/cubeslide_config.desktop
	M			effects/desktopgrid/desktopgrid_config.desktop
	M			effects/dialogparent/package/metadata.desktop
	M			effects/diminactive/diminactive_config.desktop
	M			effects/fade/package/metadata.desktop
	M			effects/fadedesktop/package/metadata.desktop
	M			effects/flipswitch/flipswitch_config.desktop
	M			effects/invert/invert_config.desktop
	M			effects/kwineffect.desktop
	M			effects/login/package/metadata.desktop
	M			effects/logout/package/metadata.desktop
	M			effects/lookingglass/lookingglass_config.desktop
	M			effects/magiclamp/magiclamp_config.desktop
	M			effects/magnifier/magnifier_config.desktop
	M			effects/mousemark/mousemark_config.desktop
	M			effects/presentwindows/presentwindows_config.desktop
	M			effects/resize/resize_config.desktop
	M			effects/showfps/showfps_config.desktop
	M			effects/showpaint/showpaint_config.desktop
	M			effects/slide/slide_config.desktop
	M			effects/thumbnailaside/thumbnailaside_config.desktop
	M			effects/trackmouse/trackmouse_config.desktop
	M			effects/translucency/package/metadata.desktop
	M			effects/wobblywindows/wobblywindows_config.desktop
	M			effects/zoom/zoom_config.desktop
	M			kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
	M			kcmkwin/kwindesktop/package/metadata.desktop
	M			kcmkwin/kwineffects/kcm_kwin_effects.desktop
	M			kcmkwin/kwineffects/package/metadata.desktop
	M			kcmkwin/kwinoptions/kwinoptions.desktop
	M			kcmkwin/kwinscreenedges/kwinscreenedges.desktop
	M			kwin.notifyrc
	M			plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop