Commit b7d2c926 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 c1dad59a
Pipeline #13037 passed with stage
in 11 minutes and 41 seconds
......@@ -11,6 +11,7 @@ Name[it]=Keysmith
Name[nl]=Keysmith
Name[pt]=Keysmith
Name[pt_BR]=Keysmith
Name[sk]=Keysmith
Name[sv]=Keysmith
Name[tg]=Keysmith
Name[uk]=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