Commit eb549f23 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 0de5df85
Pipeline #53333 skipped
......@@ -16,6 +16,7 @@
"Name": "Züricher Verkehrsverbund (ZVV)",
"Name[ca]": "Züricher Verkehrsverbund (ZVV)",
"Name[es]": "Züricher Verkehrsverbund (ZVV)",
"Name[fr]": "Züricher Verkehrsverbund (ZVV)",
"Name[nl]": "Züricher Verkehrsverbund (ZVV)",
"Name[pt]": "Züricher Verkehrsverbund (ZVV)",
"Name[sl]": "Züricher Verkehrsverbund (ZVV)",
......
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