fix(ente): resolve merge conflict markers in install script and metadata

2026-04-08 08:06:06 +02:00
parent 587f9f9b0e
commit 80147b4775
2 changed files with 4 additions and 85 deletions
--- a/json/ente.json
+++ b/json/ente.json
@@ -33,17 +33,6 @@
    },
    "notes": [
        {
-<<<<<<< HEAD
-            "text": "First-Start: Run `ente-setup` — it guides you through account creation, verification, and admin configuration",
-            "type": "warning"
-        },
-        {
-            "text": "For CLI admin docs see https://ente.io/help/self-hosting/administration/cli",
-            "type": "info"
-        },
-        {
-            "text": "Museum config: `cat /opt/ente/server/museum.yaml`",
-=======
            "text": "First-Start: Run `ente-setup` — it guides you through account creation, verification, and admin configuration.",
            "type": "info"
        },
@@ -53,7 +42,6 @@
        },
        {
            "text": "To see Museum config: `cat /opt/ente/server/museum.yaml`",
->>>>>>> bb7e2e03 (fix(postiz,ente,lobehub): address testing feedback)
            "type": "info"
        }
    ]