Fix apps.json

2020-05-14 19:52:49 +01:00 · 2020-05-14 19:52:49 +01:00 · 315131c9d8
parent f465e06cdd
commit 315131c9d8
1 changed files with 0 additions and 1 deletions
--- 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",