Commit 13591307 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 a5019a63
Pipeline #205372 skipped
......@@ -2,6 +2,7 @@
Name=Blender files
Name[ar]=ملفات بلندر
Name[bg]=Файлове на Blender
Name[ca]=Fitxers del Blender
Name[ca@valencia]=Fitxers de Blender
Name[cs]=Soubory Blender
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