Commit dfbb2039 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 817f51d8
......@@ -3,7 +3,6 @@ Name=Icon
Name[af]=Ikoon
Name[ar]=أيقونة
Name[as]=আইকন
Name[ast]=Iconu
Name[be@latin]=Ikona
Name[bg]=Икона
Name[bn]=আইকন
......
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