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

Authored by l10n daemon script <scripty@kde.org> on Nov 18 2017, 4:00 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>

Nov 18 2017, 4:00 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	P			app/org.kde.kdevelop_kdev4.desktop Copied from app/org.kde.kdevelop.desktop
	M			plugins/bazaar/org.kde.kdevelop_bzr.desktop
	M			plugins/git/org.kde.kdevelop_git.desktop
	M			plugins/subversion/org.kde.kdevelop_svn.desktop