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

Authored by l10n daemon script <scripty@kde.org> on Jul 18 2019, 6:44 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>

Jul 18 2019, 6:44 AM

Parents

Branches

Unknown

Tags

Unknown

References

tag: v19.07.80

				Path	Packages
	M			events/x11/krfb_events_x11.desktop
	M			events/x11/krfb_events_x11.json
	M			events/xdp/krfb_events_xdp.desktop
	M			events/xdp/krfb_events_xdp.json
	M			framebuffers/pipewire/krfb_framebuffer_pw.json