Commit b9fb3171 authored by Script Kiddy's avatar Script Kiddy

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 9696eacf
......@@ -7,6 +7,7 @@ Name[de]=Clazy
Name[en_GB]=Clazy
Name[es]=Clazy
Name[et]=Clazy
Name[eu]=Clazy
Name[fr]=Clazy
Name[gl]=Clazy
Name[it]=Clazy
......
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