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

Authored by l10n daemon script <scripty@kde.org> on Dec 16 2018, 7:28 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>

Dec 16 2018, 7:28 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop
	M			daemon/actions/bundled/powerdevildimdisplayaction.desktop
	M			daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop
	M			daemon/actions/bundled/powerdevilkeyboardbrightnesscontrolaction.desktop
	M			daemon/actions/bundled/powerdevilrunscriptaction.desktop
	M			daemon/actions/bundled/powerdevilwirelesspowersavingaction.desktop
	M			daemon/backends/upower/backlight_helper_actions.actions
	M			daemon/backends/upower/discretegpu_helper_actions.actions
	M			daemon/powerdevil.desktop.cmake
	M			kcmodule/activities/powerdevilactivitiesconfig.desktop
	M			kcmodule/global/powerdevilglobalconfig.desktop
	M			kcmodule/profiles/powerdevilprofilesconfig.desktop
	M			powerdevil.notifyrc