Commit 5e43a024 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 1f6506fb
Pipeline #201066 skipped
......@@ -85,7 +85,7 @@ Name[sl]=Skanpage
Name[sv]=Skanpage
Name[uk]=Skanpage
Name[x-test]=xxSkanpagexx
Name[zh_CN]=Skanpage
Name[zh_CN]=Skanpage 扫描工具
StartupNotify=false
Terminal=false
Type=Application
Supports Markdown
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