Commit 11549f15 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 a5fdf876
Pipeline #27267 skipped
......@@ -3,7 +3,7 @@
GenericName=Debug settings
GenericName[ca]=Depuració de l'arranjament
GenericName[ca]=Ajustaments de la depuració
GenericName[ca@valencia]=Depuració de l'arranjament
GenericName[cs]=Nastavení ladění
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