Commit 7200c412 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 cabf41fb
......@@ -14,6 +14,7 @@ Name[nl]=Django 1.11
Name[pl]=Django 1.11
Name[pt]=Django 1.11
Name[pt_BR]=Django 1.11
Name[ru]=Django 1.11
Name[sk]=Django 1.11
Name[sv]=Django 1.11
Name[tr]=Django 1.11
......
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