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

Authored by l10n daemon script <scripty@kde.org> on Jun 10 2018, 5:20 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>

Jun 10 2018, 5:20 AM

Parents

R161:f62f3c4b281f: Warning--

Branches

Unknown

Tags

Unknown

References

tag: v5.13.4, tag: v5.13.3, tag: v5.13.2, tag: v5.13.1

				Path	Packages
	M			src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.json
	M			src/service/plugins/eventspy/kactivitymanagerd-plugin-eventspy.json
	M			src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.json
	M			src/service/plugins/runapplication/kactivitymanagerd-plugin-runapplication.json
	M			src/service/plugins/slc/kactivitymanagerd-plugin-slc.json
	M			src/service/plugins/sqlite/kactivitymanagerd-plugin-sqlite.json
	M			src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.json