Commit f385f0b5 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 99ba93e5
Pipeline #133245 skipped
......@@ -19,6 +19,7 @@ Name[pa]=ਵੇਵੇਵ
Name[pl]=Vvave
Name[pt]=Vvave
Name[pt_BR]=Vvave
Name[ro]=Vvave
Name[sl]=Vvave
Name[sv]=Vvave
Name[uk]=Vvave
......
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