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

Authored by l10n daemon script <scripty@kde.org> on Aug 23 2016, 10:09 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>

Aug 23 2016, 10:09 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/apps/marble-kde/org.kde.marble.desktop
	M			src/apps/marble-maps/org.kde.marble.maps.desktop
	M			src/apps/marble-qt/marble-qt.desktop
	M			src/plasma/wallpapers/worldmap/metadata.desktop
	M			src/plugins/runner/gpx/marble_thumbnail_gpx.desktop
	M			src/plugins/runner/json/marble_thumbnail_geojson.desktop
	M			src/plugins/runner/kml/marble_thumbnail_kml.desktop
	M			src/plugins/runner/kml/marble_thumbnail_kmz.desktop
	M			src/plugins/runner/osm/marble_thumbnail_osm.desktop
	M			src/plugins/runner/shp/marble_thumbnail_shp.desktop