Commit 31e1fd6d 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 a839eeee
......@@ -105,6 +105,7 @@ Name[ca]=Oxygen Cold
Name[cs]=Oxygen Cold
Name[da]=Oxygen Cold
Name[el]=Oxygen ψυχρό
Name[en_GB]=Oxygen Cold
Name[es]=Oxígeno frío
Name[et]=Oxygen Cold
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