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

Authored by l10n daemon script <scripty@kde.org>.

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 20 2016, 12:39 PM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			addons/backtracebrowser/katebacktracebrowserplugin.desktop
	M			addons/close-except-like/katecloseexceptplugin.desktop
	M			addons/filebrowser/katefilebrowserplugin.desktop
	M			addons/filetree/katefiletreeplugin.desktop
	M			addons/gdbplugin/kategdbplugin.desktop
	M			addons/katebuild-plugin/katebuildplugin.desktop
	M			addons/katesql/katesql.desktop
	M			addons/konsole/katekonsoleplugin.desktop
	M			addons/openheader/kateopenheaderplugin.desktop
	M			addons/project/kateprojectplugin.desktop
	M			addons/rustcompletion/kterustcompletionplugin.desktop
	M			addons/search/katesearch.desktop
	M			addons/sessionapplet/applet/metadata.desktop
	M			addons/sessionapplet/engine/plasma-dataengine-katesessions.desktop
	M			addons/snippets/katesnippetsplugin.desktop
	M			addons/symbolviewer/katesymbolviewerplugin.desktop
	M			addons/tabswitcher/tabswitcherplugin.desktop
	M			addons/textfilter/textfilterplugin.desktop
	M			addons/xmltools/katexmltools.desktop
	M			kate/data/org.kde.kate.desktop
	M			kwrite/data/org.kde.kwrite.desktop