Commit b5c91b11 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 0d3ff602
......@@ -3,6 +3,7 @@ Type=Application
Name=Portal
Name[az]=Portal
Name[ca]=Portal
Name[de]=Portal
Name[en_GB]=Portal
Name[es]=Portal
Name[eu]=Ataria
......
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