Commit c9da217a 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 4957773d
......@@ -2,6 +2,7 @@
Name=Email Providers
Name[ca]=Proveïdors de correu electrònic
Name[ca@valencia]=Proveïdors de correu electrònic
Name[es]=Proveedores de correo
Name[gl]=Fornecedores de correo electrónico
Name[pl]=Dostawcy poczty
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