Commit 3b4d480c authored by Script Kiddy's avatar Script Kiddy
Browse files

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 a5a32155
[Desktop Entry]
Name=Angelfish
Name[ca]=Angelfish
Name[cs]=Angelfish
Name[nl]=Angelfish
Name[pt]=Angelfish
Name[sv]=Angelfish
Name[uk]=Angelfish
Name[x-test]=xxAngelfishxx
Comment=Mobile web browser
Comment[ca]=Navegador web mòbil
Comment[ca@valencia]=Navegador web mòbil
......
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