Commit 61756096 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 595b0fea
......@@ -10,6 +10,7 @@ Name[da]=Datamotor til Amarok
Name[el]=Μηχανή δεδομένων Amarok
Name[en_GB]=Amarok Data Engine
Name[eo]=Datuma motoro de Amarok
Name[es]=Motor de datos de Amarok
Name[et]=Amaroki andmemootor
Name[eu]=Amarok-eko datuen motorra
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