Commit 989a0cbc 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 7d3255c1
......@@ -15,7 +15,7 @@ Name[da]=KReversi
Name[de]=KReversi
Name[el]=KReversi
Name[en_GB]=KReversi
Name[eo]=KReversi
Name[eo]=Renverso
Name[es]=KReversi
Name[et]=KReversi
Name[eu]=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