Commit b07a8768 authored by Script Kiddy's avatar Script Kiddy

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 f3add485
......@@ -8,6 +8,7 @@ Name[en_GB]=KTrip
Name[es]=KTrip
Name[et]=KTrip
Name[fr]=KTrip
Name[ia]=KTrip
Name[it]=KTrip
Name[ko]=KTrip
Name[nl]=KTrip
......
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