Commit d392669d 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 2ba3259b
......@@ -27,6 +27,7 @@ Name[he]=KTeaTime
Name[hne]=के-टी-टाइम
Name[hr]=KTeaTime
Name[hu]=KTeaTime
Name[ia]=KTeaTime
Name[is]=K-Tetími
Name[it]=KTeaTime
Name[ja]=KTeaTime
......
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