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

Authored by l10n daemon script <scripty@kde.org> on Mar 6 2020, 4:49 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>

Mar 6 2020, 4:49 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/lib/networks/at_3_vor.json
	M			src/lib/networks/at_4_linz.json
	M			src/lib/networks/at_4_ooevv.json
	M			src/lib/networks/at_5_svv.json
	M			src/lib/networks/at_6_vvst.json
	M			src/lib/networks/at_7_vvt.json
	M			src/lib/networks/at_8_vvv.json
	M			src/lib/networks/at_oebb.json
	M			src/lib/networks/be_sncb.json
	M			src/lib/networks/de_bb_vbb.json
	M			src/lib/networks/de_be_bvg.json
	M			src/lib/networks/de_bw_bwegt.json
	M			src/lib/networks/de_bw_kvv.json
	M			src/lib/networks/de_bw_vvs.json
	M			src/lib/networks/de_by_bayern.json
	M			src/lib/networks/de_by_mvv.json
	M			src/lib/networks/de_db.json
	M			src/lib/networks/de_he_nvv.json
	M			src/lib/networks/de_he_rmv.json
	M			src/lib/networks/de_hh_hvv.json
	M			src/lib/networks/de_mv_vmv.json
	M			src/lib/networks/de_ni_efa.json
	M			src/lib/networks/de_ni_gvh.json
	M			src/lib/networks/de_ni_vbn.json
	M			src/lib/networks/de_nw_avv.json
	M			src/lib/networks/de_nw_vrr.json
	M			src/lib/networks/de_nw_zks.json
	M			src/lib/networks/de_rp_takt.json
	M			src/lib/networks/de_sh_sh.json
	M			src/lib/networks/de_sl_saarvv.json
	M			src/lib/networks/de_sn_vvo.json
	M			src/lib/networks/de_st_insa.json
	M			src/lib/networks/de_th_vmt.json
	M			src/lib/networks/dk_dsb.json
	M			src/lib/networks/pl_pkp.json