Commit 2bc79f7b 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 a50d30b1
......@@ -20,6 +20,7 @@ Name[gl]=Wikipedia
Name[he]=ויקיפדיה
Name[hr]=Wikipedija
Name[hu]=Wikipédia
Name[ia]=Wikipedia
Name[id]=Wikipedia
Name[it]=Wikipedia
Name[ja]=Wikipedia
......
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