From d71ed4ea2ed42f8836f9e5503091ad53795f5017 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 13 Dec 2021 09:48:55 +0000
Subject: [PATCH] fix merge error

---
 apps.json | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/apps.json b/apps.json
index 2282a950c..04a523a45 100644
--- a/apps.json
+++ b/apps.json
@@ -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}
     ]
   }
-}
 ]