fix merge error

pull/1072/head^2
Gordon Williams 2021-12-13 09:48:55 +00:00
parent fcffb710e0
commit d71ed4ea2e
1 changed files with 16 additions and 17 deletions

View File

@ -4847,22 +4847,22 @@
"data": [{"name":"ptlaunch.patterns.json"}]
},
{ "id": "clicompleteclk",
"name": "CLI complete clock",
"shortName":"CLI cmplt clock",
"version":"0.03",
"description": "Command line styled clock with lots of information",
"icon": "app.png",
"allow_emulator": true,
"type": "clock",
"tags": "clock,cli,command,bash,shell,weather,hrt",
"supports" : ["BANGLEJS", "BANGLEJS2"],
"readme": "README.md",
"storage": [
{"name":"clicompleteclk.img","url":"app-icon.js","evaluate":true},
{"name":"clicompleteclk.settings.js","url":"settings.js"}
],
"data": [{"name":"clicompleteclk.json"}]
},
"name": "CLI complete clock",
"shortName":"CLI cmplt clock",
"version":"0.03",
"description": "Command line styled clock with lots of information",
"icon": "app.png",
"allow_emulator": true,
"type": "clock",
"tags": "clock,cli,command,bash,shell,weather,hrt",
"supports" : ["BANGLEJS", "BANGLEJS2"],
"readme": "README.md",
"storage": [
{"name":"clicompleteclk.img","url":"app-icon.js","evaluate":true},
{"name":"clicompleteclk.settings.js","url":"settings.js"}
],
"data": [{"name":"clicompleteclk.json"}]
},
{
"id":"awairmonitor",
"name":"Awair Monitor",
@ -4878,5 +4878,4 @@
{"name":"awairmonitor.img","url":"app-icon.js","evaluate":true}
]
}
}
]