Commit f775179c 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 8fde95f0
......@@ -20,6 +20,7 @@ Name[sk]=Poskytovatelia mailu
Name[sv]=E-postleverantörer
Name[uk]=Надавачі послуг електронної пошти
Name[x-test]=xxEmail Providersxx
Name[zh_CN]=电子邮件供应商
Name[zh_TW]=信箱提供者
ProvidersUrl=https://download.kde.org/ocs/providers.xml
Categories=Akonadi Email Providers
......
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