Commit 15734829 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 737f7717
......@@ -15,6 +15,7 @@ Name[et]=SMART
Name[eu]=SMART
Name[fi]=SMART
Name[fr]=SMART
Name[hu]=SMART
Name[it]=SMART
Name[ko]=SMART
Name[nl]=SMART
......
......@@ -23,6 +23,7 @@ Name[et]=SMART
Name[eu]=SMART
Name[fi]=SMART
Name[fr]=SMART
Name[hu]=SMART
Name[it]=SMART
Name[ko]=SMART
Name[nl]=SMART
......
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