Commit e27e2c98 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 76d7c2dd
Pipeline #5218 passed with stage
in 6 minutes and 26 seconds
[Desktop Entry]
Name=Calindori
Name[ca]=Calindori
Name[es]=Calindori
Name[it]=Calindori
Name[nl]=Calindori
Name[pt]=Calindori
......@@ -9,6 +10,7 @@ Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Comment=Calindori
Comment[ca]=Calindori
Comment[es]=Calindori
Comment[it]=Calindori
Comment[nl]=Calindori
Comment[pt]=Calindori
......
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