Commit 421c7e9f 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 66380b9f
......@@ -4,7 +4,6 @@ Type=Application
X-DocPath=kshisen/index.html
Name=Shisen-Sho
Name[af]=Shisen-sho
Name[ast]=Shisen-Sho
Name[be]=Ші-сен-сёе
Name[bn]=শিসেন-শো
Name[br]=Shisen-Sho
......
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