Commit 6e4e99d7 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 4037db99
......@@ -19,6 +19,7 @@ Name[pt]=Fornecedores de E-Mail
Name[pt_BR]=Fornecedores de e-mail
Name[ru]=Почтовые службы
Name[sk]=Poskytovatelia mailu
Name[sl]=Ponudniki elektronske pošte
Name[sv]=E-postleverantörer
Name[uk]=Надавачі послуг електронної пошти
Name[x-test]=xxEmail Providersxx
......
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