Commit c6548fce 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 cf2e654d
Pipeline #31931 skipped
...@@ -14,6 +14,7 @@ Name[et]=MBoxImporter ...@@ -14,6 +14,7 @@ Name[et]=MBoxImporter
Name[fi]=MBoxImporter Name[fi]=MBoxImporter
Name[fr]=MBoxImporter Name[fr]=MBoxImporter
Name[gl]=MBoxImporter Name[gl]=MBoxImporter
Name[hi]=MBox आयातक
Name[hu]=MBoxImporter Name[hu]=MBoxImporter
Name[ia]=MBoxImporter Name[ia]=MBoxImporter
Name[it]=MBoxImporter Name[it]=MBoxImporter
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