From 315131c9d8484106e5a344aa9f62074e41a2385f Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Thu, 14 May 2020 19:52:49 +0100
Subject: [PATCH] Fix apps.json

---
 apps.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps.json b/apps.json
index 2be79db83..c46de601d 100644
--- a/apps.json
+++ b/apps.json
@@ -1568,7 +1568,6 @@
       {"name":"hidjoystick.img","url":"app-icon.js","evaluate":true}
     ]
   },
-<<<<<<< HEAD
   {
     "id": "largeclock",
     "name": "Large Clock",