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

Authored by l10n daemon script <scripty@kde.org> on Nov 11 2019, 8:47 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 11 2019, 8:47 AM

Parents

Branches

Unknown

Tags

Unknown

References

tag: v19.11.80, tag: refs/backups/tag-v20.03.80-1584746250

				Path	Packages
	M			generators/comicbook/okularApplication_comicbook.desktop
	M			generators/comicbook/org.kde.mobile.okular_comicbook.desktop
	M			generators/markdown/libokularGenerator_md.json
	M			generators/markdown/okularApplication_md.desktop
	M			generators/markdown/org.kde.mobile.okular_md.desktop