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

Authored by l10n daemon script <scripty@kde.org> on Jan 9 2019, 4:31 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 9 2019, 4:31 AM

Parents

R224:9f5cdf1a2177: Do not close m_socket in socketError()

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/contacts/kdeconnect_contacts.json
	M			plugins/findmyphone/kdeconnect_findmyphone.json
	M			plugins/findthisdevice/kdeconnect_findthisdevice.json
	M			plugins/lockdevice/kdeconnect_lockdevice.json
	M			plugins/mousepad/kdeconnect_mousepad.json
	M			plugins/notifications/kdeconnect_notifications.json
	M			plugins/pausemusic/kdeconnect_pausemusic.json
	M			plugins/remotecommands/kdeconnect_remotecommands.json
	M			plugins/remotecontrol/kdeconnect_remotecontrol.json
	M			plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
	M			plugins/runcommand/kdeconnect_runcommand.json
	M			plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
	M			plugins/sms/kdeconnect_sms.json
	M			plugins/systemvolume/kdeconnect_systemvolume.json