Fix an issue with conflict resolution after merging with upstream

src/apps.json

@@ -15302,78 +15302,6 @@
       },
       "website": "https://www.xt-commerce.com"
     },
-    "Yepcomm": {
-      "cats": [
-        6
-      ],
-      "icon": "yepcomm.png",
-      "meta": {
-        "copyright": "Yepcomm Tecnologia",
-        "author": "Yepcomm Tecnologia"
-      },
-      "website": "https://www.yepcomm.com.br"
-    },
-    "Halo": {
-      "cats": [
-        1,
-        11
-      ],
-      "icon": "Halo.svg",
-      "meta": {
-        "generator": "Halo ([\\d.]+)?\\;version:\\1"
-      },
-      "implies": "Java",
-      "website": "https://halo.run"
-    },
-    "Rocket": {
-      "cats": [
-        1,
-        6
-      ],
-      "headers": {
-        "x-powered-by": "^Rocket=https://rocketcms.io/"
-      },
-      "icon": "Rocket.svg",
-      "implies": [
-        "webpack",
-        "Node.js",
-        "MySQL",
-        "Less"
-      ],
-      "website": "https://rocketcms.io"
-    },
-    "Zipkin": {
-      "cats": [
-        10
-      ],
-      "headers": {
-        "X-B3-TraceId": "",
-        "X-B3-SpanId": "",
-        "X-B3-ParentSpanId": "",
-        "X-B3-Sampled": "",
-        "X-B3-Flags": ""
-      },
-      "icon": "Zipkin.png",
-      "website": "https://zipkin.io/"
-    },
-    "RX Web Server": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "X-Powered-By": "RX-WEB"
-      },
-      "icon": "RXWeb.svg",
-      "website": "http://developers.rokitax.co.uk/projects/rxweb"
-    },
-    "Tencent Waterproof Wall": {
-      "cats": [
-        9
-      ],
-      "icon": "TencentWaterproofWall.png",
-      "script": "/TCaptcha\\.js",
-      "website": "https://007.qq.com/"
-    },
     "NitroPack": {
       "cats": [
         23