Commit d5336db9 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 eb2a4c72
......@@ -71,7 +71,6 @@ Name[x-test]=xxShisen-Shoxx
GenericName=Shisen-Sho Mahjongg-like Tile Game
GenericName[ast]=Xuegu de fiches asemeyáu al Shisen-Sho de Mahjongg
GenericName[be]=Варыянт маджонга Шысен-сё
GenericName[bn]=শিসেন-শো মাহজং-জাতীয় টালির খেলা
GenericName[br]=Ur c'hoari teol a seurt gant Shisen*Sho Mahjongg
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