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

Authored by l10n daemon script <scripty@kde.org> on Apr 3 2018, 5:12 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 3 2018, 5:12 AM

Parents

Branches

Unknown

Tags

Unknown

References

tag: v18.03.90

				Path	Packages
	M			addons/close-except-like/katecloseexceptplugin.desktop
	M			addons/filebrowser/katefilebrowserplugin.desktop
	M			addons/filetree/katefiletreeplugin.desktop
	M			addons/openheader/kateopenheaderplugin.desktop
	M			addons/search/katesearch.desktop
	M			addons/xmlcheck/katexmlcheck.desktop