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

Authored by l10n daemon script <scripty@kde.org> on May 12 2020, 4:14 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>

May 12 2020, 4:14 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			choqok/choqok.notifyrc
	M			choqok/config/accounts/choqok_accountsconfig.desktop
	M			choqok/config/appearance/choqok_appearanceconfig.desktop
	M			choqok/config/behavior/choqok_behaviorconfig.desktop
	M			choqok/config/plugins/choqok_pluginconfig.desktop
	M			choqok/org.kde.choqok.desktop
	M			libchoqok/choqokplugin.desktop
	M			microblogs/friendica/choqok_friendica.desktop
	M			microblogs/laconica/choqok_laconica.desktop
	M			microblogs/mastodon/choqok_mastodon.desktop
	M			microblogs/pumpio/choqok_pumpio.desktop
	M			microblogs/twitter/choqok_twitter.desktop
	M			plugins/filter/choqok_filter.desktop
	M			plugins/imagepreview/choqok_imagepreview.desktop
	M			plugins/imstatus/choqok_imstatus.desktop
	M			plugins/imstatus/choqok_imstatus_config.desktop
	M			plugins/konqueror/choqok_share.desktop