Commit 69898ca5 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 dd999334
Pipeline #51531 skipped
......@@ -28,6 +28,7 @@
"Name[pt]": "Aditya Mehra",
"Name[pt_BR]": "Aditya Mehra",
"Name[ro]": "Aditya Mehra",
"Name[ru]": "Aditya Mehra",
"Name[sk]": "Aditya Mehra",
"Name[sl]": "Aditya Mehra",
"Name[sv]": "Aditya Mehra",
......
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