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

Authored by l10n daemon script <scripty@kde.org> on Jul 29 2019, 2:46 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>

Jul 29 2019, 2:46 AM

Parents

Branches

Unknown

Tags

Unknown

References

refs/keep-around/ecedab2bc726ba6a914d3efb3b1e132926f91f2a

				Path	Packages
	M			krita/data/templates/comics/Manga-JpTemplate.desktop
	M			krita/data/templates/texture/Texture1k32bitscalar.desktop
	M			krita/data/templates/texture/Texture2k32bitscalar.desktop
	M			krita/data/templates/texture/Texture4k32bitscalar.desktop
	M			krita/data/templates/texture/Texture8k32bitscalar.desktop