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

Authored by l10n daemon script <scripty@kde.org> on Nov 17 2015, 12:52 PM.

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

Rajdeep Kaur <rajdeep51994@gmail.com>

Dec 17 2015, 2:22 PM

Parents

R2:3bc447386fd2: SVN_SILENT made messages (after extraction)

Branches

Unknown

Tags

Unknown

Rajdeep Kaur <rajdeep51994@gmail.com> committed R2:5e0a6f922253: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 17 2015, 2:22 PM

Restricted Application added a subscriber: jjazeix. · View Herald TranscriptJan 25 2016, 5:48 PM

				Path	Packages
	M			org.kde.gcompris.desktop
	M			platforms/sailfishOS/harbour-gcompris-qt.desktop