Commit e9d59af0 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 697315dd
......@@ -10,6 +10,7 @@ Name[et]=KOrganizeri kalender
Name[fr]=Calendrier KOrganizer
Name[gl]=Calendario de KOrganizer
Name[ia]=Calendario de KOrganizer
Name[it]=Calendario di KOrganizer
Name[ko]=KOrganizer 달력
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