Commit 0a4952d3 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 13053ed7
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=exchangeratesapi.io Name=exchangeratesapi.io
Name[ca]=exchangeratesapi.io Name[ca]=exchangeratesapi.io
Name[ca@valencia]=exchangeratesapi.io Name[ca@valencia]=exchangeratesapi.io
Name[cs]=exchangeratesapi.io
Name[es]=exchangeratesapi.io Name[es]=exchangeratesapi.io
Name[et]=exchangeratesapi.io Name[et]=exchangeratesapi.io
Name[fr]=exchangeratesapi.io Name[fr]=exchangeratesapi.io
......
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