From fa0b4f59b0001b2cd0878dc99e09bbc107fbab68 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Wed, 15 Mar 2023 18:47:25 +0100
Subject: [PATCH] Merge Fixes

---
 public/data/pages.json | 51 ++----------------------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/public/data/pages.json b/public/data/pages.json
index 3ddbd0e..639019c 100644
--- a/public/data/pages.json
+++ b/public/data/pages.json
@@ -3,14 +3,9 @@
     {
       "name": "Nextcloud",
       "icon": "/icons/nextcloud-logo.svg",
-<<<<<<< HEAD:public/pages.json
       "href": "https://nextcloud.neshweb.net/",
       "desc1": "Cloud Storage",
       "desc": "Self-hosted Cloud Storage Service but longer and hopefully with wrap as well as some extra just to make sure",
-=======
-      "href": "https://nextcloud.neshweb.net",
-      "desc": "Self-hosted Cloud Storage Service",
->>>>>>> main:public/data/pages.json
       "warn": "Note: Registration requires approval",
       "extLink": "https://qwant.com",
       "extName": "Qwant",
@@ -19,20 +14,11 @@
       "location": "tower-0"
     },
     {
-<<<<<<< HEAD:public/pages.json
-      "name": "Komga",
-      "icon": "/icons/komga-logo.png",
-      "href": "https://komga.neshweb.net/",
-      "desc1": "Manga/Comics",
-      "desc": "Self-hosted Comic Library",
-      "warn": "Note: Registration only via Admin",
-=======
       "name": "Kavita",
       "icon": "/icons/kavita-logo.svg",
       "href": "https://kavita.neshweb.net",
       "desc": "Self-hosted Manga Library",
       "warn": "Registration via Admin invite",
->>>>>>> main:public/data/pages.json
       "type": "docker",
       "docker_container_name": "kavita",
       "location": "tower-0"
@@ -51,12 +37,8 @@
     {
       "name": "PeerTube",
       "icon": "/icons/peertube-logo.svg",
-<<<<<<< HEAD:public/pages.json
       "href": "https://tube.neshweb.net/",
       "desc1": "Video Platform",
-=======
-      "href": "https://tube.neshweb.net",
->>>>>>> main:public/data/pages.json
       "desc": "Self-hosted PeerTube Instance",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
@@ -66,12 +48,8 @@
     {
       "name": "Mastodon",
       "icon": "/icons/mastodon-logo.svg",
-<<<<<<< HEAD:public/pages.json
       "href": "https://mastodon.neshweb.net/",
       "desc1": "Twitter Alternative",
-=======
-      "href": "https://mastodon.neshweb.net",
->>>>>>> main:public/data/pages.json
       "desc": "Self-hosted Mastodon Instance",
       "warn": "Note: Registration requires approval",
       "type": "docker",
@@ -162,29 +140,7 @@
       "warn": "Note: Admin Only",
       "type": "docker",
       "docker_container_name": "nginx-prox",
-<<<<<<< HEAD:public/pages.json
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Grafana",
-      "icon": "/icons/grafana-logo.svg",
-      "href": "https://monitoring.neshweb.net/",
-      "desc1": "Server Monitoring",
-      "desc": "Server Monitoring Utility",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "grafana",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Matomo",
-      "href": "https://tracking.neshweb.net/",
-      "desc1": "Traffic Monitoring",
-      "desc": "Traffic Tracking Utility",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "matomo-web",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Debug1",
@@ -196,7 +152,7 @@
       "extName": "Qwant",
       "type": "docker",
       "docker_container_name": "matomo-web",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Debug2",
@@ -207,8 +163,6 @@
       "extName": "Qwant",
       "type": "docker",
       "docker_container_name": "Debug",
-      "location": "brr7-4800u"
-=======
       "location": "tower-0"
     },
     {
@@ -219,7 +173,6 @@
       "warn": "Note: Admin Only",
       "type": "app",
       "location": ""
->>>>>>> main:public/data/pages.json
     }
   ],
   "games": {