Commit 92f82817 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 c289495c
{
"KPlugin": {
"Name": "Default Grantlee Header Style",
"Name[ca]": "Estil de capçalera «Grantlee» predeterminat",
"Name[fi]": "Grantlee-oletusotsaketyyli",
"Name[nl]": "Stijl met standaard Grantlee header",
"Name[uk]": "Типовий стиль заголовків Grantlee",
"Name[x-test]": "xxDefault Grantlee Header Stylexx",
"ServiceTypes": [
"MessageViewerHeaderStyle/Plugin"
],
......
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