Commit 83bbce94 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent a9bfd527
Pipeline #91869 skipped
......@@ -3,6 +3,7 @@ Type=Service
Name=Tickets and boarding passes
Name[ca]=Entrades i passis d'embarcament
Name[es]=Billetes y tarjetas de embarque
Name[fr]=Billets et cartes d'embarquement
Name[it]=Biglietti e carte d'imbarco
Name[nl]=Tickets en boardingpassen
Name[sv]=Biljetter och boardingkort
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment