Commit 4b1ff759 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 e1ee8d1f
Pipeline #26054 skipped
......@@ -2,7 +2,6 @@
"KPlugin": {
"Dependencies": [],
"Description": "A panel for working with files inside Cantor",
"Description[ru]": "Панель для работы с файлами внутри Cantor",
"Icon": "",
"Id": "FileBrowserPanel",
"License": "GPL",
......
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