Commit 740d9981 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 21fd6aa1
......@@ -7,7 +7,7 @@ Name[bn]=কে-রিভার্সি
Name[br]=KReversi
Name[bs]=KReversi
Name[ca]=KReversi
Name[ca@valencia]=Reversi
Name[ca@valencia]=KReversi
Name[cs]=KReversi
Name[cy]=KReversi
Name[da]=KReversi
......
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