Commit 24a1bbe5 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 f9bbdcf1
Pipeline #93432 skipped
......@@ -9,6 +9,7 @@ Name[ia]=Billetes e carts de imbarcar
Name[it]=Biglietti e carte d'imbarco
Name[nl]=Tickets en boardingpassen
Name[pl]=Bilety i karty pokładowe
Name[sl]=Vozovnice in vstopni kuponi
Name[sv]=Biljetter och boardingkort
Name[uk]=Квитки та посадкові талони
Name[x-test]=xxTickets and boarding passesxx
......
Supports Markdown
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