Commit dbed43b4 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 f63c1b18
......@@ -133,6 +133,7 @@ Comment[sv]=Sammanbind punkterna för att skapa fyrkanter
Comment[tr]=Noktaları birleştirerek kare yap
Comment[uk]=З’єднайте точки, щоб створити квадрати
Comment[x-test]=xxConnect the dots to create squaresxx
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