Commit f2da5f98 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 40a54910
Pipeline #12990 passed with stage
in 12 minutes and 47 seconds
......@@ -5,6 +5,7 @@ Name[cs]=Keysmith
Name[en_GB]=Keysmith
Name[es]=Keysmith
Name[et]=Keysmith
Name[fi]=Keysmith
Name[fr]=Keysmith
Name[it]=Keysmith
Name[nl]=Keysmith
......
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