Commit bbd217de 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 e3bd16dd
......@@ -3,6 +3,7 @@ Name=Ikona
Name[ca]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
Name[sk]=Ikona
Name[uk]=Ikona
Name[x-test]=xxIkonaxx
......
......@@ -4,6 +4,7 @@ Name=Ikona
Name[ca]=Ikona
Name[nl]=Ikona
Name[pt]=Ikona
Name[ru]=Ikona
Name[sk]=Ikona
Name[uk]=Ikona
Name[x-test]=xxIkonaxx
......
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