Commit 6b4b3c35 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 cc4c4281
...@@ -176,6 +176,7 @@ Comment[sl]=Enostaven program za risanje ...@@ -176,6 +176,7 @@ Comment[sl]=Enostaven program za risanje
Comment[sv]=Ett lättanvänt ritprogram Comment[sv]=Ett lättanvänt ritprogram
Comment[uk]=Проста у користуванні програма для малювання Comment[uk]=Проста у користуванні програма для малювання
Comment[x-test]=xxAn easy-to-use paint programxx Comment[x-test]=xxAn easy-to-use paint programxx
Icon=kolourpaint Icon=kolourpaint
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