Commit 8affb891 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 d1de1888
......@@ -111,6 +111,7 @@ Comment[da]=Logikspil
Comment[en_GB]=Logic game
Comment[es]=Juego de lógica
Comment[fr]=Jeu de logique
Comment[gl]=Xogo de lóxica.
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