Commit eb6a3b66 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 faab2910
{
"Encoding": "UTF-8",
"Encoding": "UTF-8",
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for GStreamer.",
"Id": "artikulate_gstreamer_backend",
"License": "GPL",
"Name": "GStreamer Backend",
"Category": "Plugins",
"Description": "Sound backend for GStreamer.",
"Id": "artikulate_gstreamer_backend",
"License": "GPL",
"Name": "GStreamer Backend",
"ServiceTypes": [
"artikulate/libsound/backend"
],
],
"Version": "0.1"
}
}
}
\ No newline at end of file
{
"Encoding": "UTF-8",
"Encoding": "UTF-8",
"KPlugin": {
"Category": "Plugins",
"Description": "Sound backend for QtMultimedia.",
"Id": "artikulate_qtmultimedia_backend",
"License": "GPL",
"Name": "QtMultimedia Backend",
"Category": "Plugins",
"Description": "Sound backend for QtMultimedia.",
"Id": "artikulate_qtmultimedia_backend",
"License": "GPL",
"Name": "QtMultimedia Backend",
"ServiceTypes": [
"artikulate/libsound/backend"
],
],
"Version": "0.1"
}
}
}
\ No newline at end of file
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