Commit 008e698d 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 be8f58ac
......@@ -61,6 +61,7 @@ Comment[sr@latin]=Pristup istorijatu klipborda
Comment[sv]=Ger tillgång till klippbordshistoriken
Comment[uk]=Надає доступ до журналу буфера обміну даними
Comment[x-test]=xxProvides access to the clipboard historyxx
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