08eaaf11e1
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"
28 lines
No EOL
758 B
JSON
28 lines
No EOL
758 B
JSON
{
|
|
"Encoding": "UTF-8",
|
|
"KPlugin": {
|
|
"Authors": [
|
|
{
|
|
"Email": "albertvaka@gmail.com",
|
|
"Name": "Albert Vaca"
|
|
}
|
|
],
|
|
"Description": "Show your phone battery next to your computer battery",
|
|
"EnabledByDefault": true,
|
|
"Icon": "battery-100",
|
|
"Id": "kdeconnect_battery",
|
|
"License": "GPL",
|
|
"Name": "Battery monitor",
|
|
"ServiceTypes": [
|
|
"KdeConnect/Plugin"
|
|
],
|
|
"Version": "0.1",
|
|
"Website": "http://albertvaka.wordpress.com"
|
|
},
|
|
"X-KdeConnect-OutgoingPackageType": [
|
|
"kdeconnect.battery"
|
|
],
|
|
"X-KdeConnect-SupportedPackageType": [
|
|
"kdeconnect.battery"
|
|
]
|
|
} |