Commit 7d1edc35 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 2b828ff5
......@@ -178,7 +178,6 @@ Comment[sv]=Ett lättanvänt ritprogram
Comment[uk]=Проста у користуванні програма для малювання
Comment[x-test]=xxAn easy-to-use paint programxx
Comment[zh_CN]=一个简单易用的画图程序
Comment[zh_TW]=一個易於使用的繪圖程式
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