Commit e8321bd5 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 286906e4
Pipeline #187823 skipped
......@@ -78,7 +78,7 @@ Comment[bg]=Практически упражнения с дроби
Comment[bn]=ভগ্নাংশের অংকের অনুশীলনী চর্চা করুন
Comment[bs]=Vježbajte razlomke
Comment[ca]=Practica exercicis amb fraccions
Comment[ca@valencia]=Practica exercicis amb fraccions
Comment[ca@valencia]=Practica eixercicis amb fraccions
Comment[cs]=Praktická cvičení se zlomky
Comment[csb]=Cwiczenczi z kawelkòwaniô
Comment[cy]=Ymarfer ymarferion efo ffracsiynnau
......
Supports Markdown
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