Commit d9d964d5 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 e8ba6631
......@@ -39,5 +39,5 @@ Comment[sv]=Ett Django-projekt med ett program
Comment[tr]=Uygulama ile birlikte bir Django projesi
Comment[uk]=Проект Django із однією програмою
Comment[x-test]=xxA Django project with one applicationxx
Comment[zh_CN]=有一个应用的 Django 项目
Comment[zh_CN]=有一个应用的 Django 工程
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment