Commit 40262b00 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 abe5f047
Pipeline #4884 passed with stage
in 6 minutes and 29 seconds
[Desktop Entry]
Name=Calindori
Name[ca]=Calindori
Name[it]=Calindori
Name[nl]=Calindori
Name[pt]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Comment=Calindori
Comment[ca]=Calindori
Comment[it]=Calindori
Comment[nl]=Calindori
Comment[pt]=Calindori
Comment[sv]=Calindori
Comment[uk]=Calindori
Comment[x-test]=xxCalindorixx
Exec=calindori
MimeType=application/x-calindori;
Icon=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