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

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

Parents

Branches

Unknown

Tags

Unknown

References

tag: v19.07.90, tag: v19.07.80

				Path	Packages
	M			bazaar/fileviewbazaarplugin.desktop
	M			dropbox/fileviewdropboxplugin.desktop
	M			git/fileviewgitplugin.desktop
	M			hg/fileviewhgplugin.desktop
	M			svn/fileviewsvnplugin.desktop