Commit c481bc4c 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 ecef8e6a
Pipeline #55933 skipped
......@@ -19,6 +19,7 @@
"Name[ca@valencia]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[ca]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[cs]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[de]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[es]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[fr]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[it]": "Verkehrsverbund Rhein-Sieg (VRS)",
......
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