Commit e6393b8e 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 3e8579ff
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"application/x-cd-image" "application/x-cd-image"
], ],
"Name": "Mount and unmount iso image", "Name": "Mount and unmount iso image",
"Name[x-test]": "xxMount and unmount iso imagexx",
"ServiceTypes": [ "ServiceTypes": [
"KFileItemAction/Plugin" "KFileItemAction/Plugin"
] ]
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