Commit 2ace4630 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 2169c000
......@@ -12,6 +12,7 @@ Name[sk]=KTrip
GenericName=Public transport navigator
GenericName[ca]=Navegador del transport públic
GenericName[de]=Navigation für öffentliche Verkehrsmittel
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