Commit d66d2cdf 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 8465542b
......@@ -35,7 +35,7 @@ Name[nn]=KGoldrunner-standard
Name[pa]=ਕੇ-ਗੋਲਡ ਰਨਰ ਡਿਫਾਲਟ
Name[pl]=Domyślny wystrój KGoldrunnera
Name[pt]=Predefinição do KGoldrunner
Name[pt_BR]=KGoldrunner Padrão
Name[pt_BR]=KGoldRunner Padrão
Name[ro]=Implicită KGoldrunner
Name[sk]=KGoldRunner predvolené
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