From f4f7024d4139befa60104520c2691378b584581f Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Mon, 21 Feb 2022 16:39:20 -0700
Subject: [PATCH] Conflict fixes

---
 appStore/_example/package.json | 17 -----------------
 apps/docs/pages/meta.json      | 15 +++++++++++++++
 apps/web/lib/apps/meta.json    | 14 --------------
 3 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100644 appStore/_example/package.json
 create mode 100644 apps/docs/pages/meta.json
 delete mode 100644 apps/web/lib/apps/meta.json

diff --git a/appStore/_example/package.json b/appStore/_example/package.json
deleted file mode 100644
index e9f4affd47..0000000000
--- a/appStore/_example/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "private": true,
-  "name": "zoom",
-  "label": "Zoom",
-  "⬇️ needs to be the same as the folder name": 1,
-  "slug": "zoom",
-  "category": "Video Conferencing",
-  "description": "Zoom is the most popular video conferencing platform, joinable on the web or via desktop/mobile apps.",
-  "logo": "/apps/zoom.svg",
-  "publisher": "Cal.com",
-  "url": "https://zoom.us/",
-  "verified": true,
-  "⬇️ TODO: placeholder for now, pull this from TrustPilot or G2": 1,
-  "rating": 4.3,
-  "⬇️ TODO 2: placeholder for now, pull this from TrustPilot or G2": 1,
-  "reviews": 69
-}
diff --git a/apps/docs/pages/meta.json b/apps/docs/pages/meta.json
new file mode 100644
index 0000000000..487b4b86ac
--- /dev/null
+++ b/apps/docs/pages/meta.json
@@ -0,0 +1,15 @@
+{
+  "index": "Home",
+  "self-hosting": "Self-hosting",
+  "availability": "Availability",
+  "bookings": "Bookings",
+  "event-types": "Event Types",
+  "teams": "Teams",
+  "integrations": "Integrations",
+  "webhooks": "Webhooks",
+  "settings": "Settings",
+  "import": "Import",
+  "billing": "Billing",
+  "developer": "Developer",
+  "faq": "FAQs"
+}
diff --git a/apps/web/lib/apps/meta.json b/apps/web/lib/apps/meta.json
deleted file mode 100644
index 83456d51c1..0000000000
--- a/apps/web/lib/apps/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "index": 1,
-  "self-hosting": 1,
-  "availability": 1,
-  "bookings": 1,
-  "event-types": 1,
-  "teams": 1,
-  "integrations": 1,
-  "webhooks": 1,
-  "settings": 1,
-  "import": 1,
-  "billing": 1,
-  "developer": 1
-}