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

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

Jan 6 2019, 7:45 AM

Parents

Branches

Unknown

Tags

Unknown

References

tag: v18.12.1

				Path	Packages
	M			src/data/kmail_config_accounts.desktop
	M			src/data/kmail_config_composer.desktop
	M			src/data/kmail_config_misc.desktop
	M			src/data/kmail_config_security.desktop
	M			src/data/org.kde.kmail2.desktop
	M			src/kontactplugin/kmail/kmail.setdlg
	M			src/kontactplugin/kmail/kmailplugin.desktop
	M			src/kontactplugin/summary/summary.setdlg
	M			src/kontactplugin/summary/summaryplugin.desktop