Commit e9cdfa4a 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 6d7f4c80
......@@ -17,7 +17,7 @@ Name[da]=Oxygen vinduesdekoration
Name[el]=Διακοσμήσεις παραθύρου Oxygen
Name[en_GB]=Oxygen Window Decoration
Name[es]=Decoración de ventanas Oxígeno
Name[es]=Decoración de ventanas de Oxígeno
Name[et]=Oxygeni akna dekoratsioon
Name[eu]=Oxygen leihoen apaindura
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