fix: resolve conflict markers accidentally committed during meta migration

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-10 00:15:28 +02:00 · 2026-07-08 01:13:47 -06:00
parent c6c07246b6
commit fc447e3a9a
12 changed files with 0 additions and 153 deletions
--- a/blueprints/gotify/docker-compose.yml
+++ b/blueprints/gotify/docker-compose.yml
@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-version: "3.8"
-
-services:
-  gotify:
-    image: gotify/server:latest
-    restart: unless-stopped
-    expose:
-      - "80"
-    environment:
-      - GOTIFY_DEFAULTUSER_PASS=${GOTIFY_DEFAULTUSER_PASS}
-    volumes:
-      - gotify-data:/app/data
-
-volumes:
-  gotify-data:
-=======
 services:
  gotify:
    image: gotify/server:2.9.1
@@ -26,4 +9,3 @@ services:

 volumes:
  gotify_data:
->>>>>>> origin/canary
--- a/blueprints/gotify/gotify.svg
+++ b/blueprints/gotify/gotify.svg
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120"><rect width="120" height="120" rx="24" fill="#2563eb"/><path d="M25 40h70v34H74l-14 14-14-14H25z" fill="#fff"/><circle cx="44" cy="57" r="5" fill="#2563eb"/><circle cx="60" cy="57" r="5" fill="#2563eb"/><circle cx="76" cy="57" r="5" fill="#2563eb"/></svg>
-=======
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
  <rect width="128" height="128" rx="28" fill="#101828"/>
  <circle cx="64" cy="64" r="34" fill="#38bdf8" opacity="0.92"/>
  <text x="64" y="74" text-anchor="middle" font-family="Arial, sans-serif" font-size="30" font-weight="700" fill="#ffffff">G</text>
 </svg>
->>>>>>> origin/canary
--- a/blueprints/gotify/template.toml
+++ b/blueprints/gotify/template.toml
@@ -1,16 +1,4 @@
 [variables]
-<<<<<<< HEAD
-admin_password = "${password:32}"
-
-[config]
-[[config.domains]]
-serviceName = "gotify"
-port = 80
-host = "${domain}"
-
-[config.env]
-GOTIFY_DEFAULTUSER_PASS = "${admin_password}"
-=======
 main_domain = "${domain}"

 [config]
@@ -21,4 +9,3 @@ mounts = []
 serviceName = "gotify"
 port = 80
 host = "${main_domain}"
->>>>>>> origin/canary
--- a/blueprints/jellyseerr/docker-compose.yml
+++ b/blueprints/jellyseerr/docker-compose.yml
@@ -1,21 +1,3 @@
-<<<<<<< HEAD
-version: "3.8"
-
-services:
-  jellyseerr:
-    image: fallenbagel/jellyseerr:latest
-    restart: unless-stopped
-    expose:
-      - "5055"
-    environment:
-      - LOG_LEVEL=info
-      - TZ=${TZ}
-    volumes:
-      - jellyseerr-config:/app/config
-
-volumes:
-  jellyseerr-config:
-=======
 services:
  jellyseerr:
    image: fallenbagel/jellyseerr:2.7.3
@@ -29,4 +11,3 @@ services:

 volumes:
  jellyseerr_config:
->>>>>>> origin/canary
--- a/blueprints/jellyseerr/jellyseerr.svg
+++ b/blueprints/jellyseerr/jellyseerr.svg
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120"><rect width="120" height="120" rx="24" fill="#7dd3fc"/><circle cx="60" cy="60" r="34" fill="#0f172a"/><path d="M45 54c6-9 24-9 30 0M43 70c8 10 26 10 34 0" fill="none" stroke="#7dd3fc" stroke-width="7" stroke-linecap="round"/><circle cx="48" cy="58" r="5" fill="#7dd3fc"/><circle cx="72" cy="58" r="5" fill="#7dd3fc"/></svg>
-=======
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
  <rect width="128" height="128" rx="28" fill="#101828"/>
  <circle cx="64" cy="64" r="34" fill="#38bdf8" opacity="0.92"/>
  <text x="64" y="74" text-anchor="middle" font-family="Arial, sans-serif" font-size="30" font-weight="700" fill="#ffffff">J</text>
 </svg>
->>>>>>> origin/canary
--- a/blueprints/jellyseerr/template.toml
+++ b/blueprints/jellyseerr/template.toml
@@ -1,16 +1,4 @@
 [variables]
-<<<<<<< HEAD
-timezone = "Etc/UTC"
-
-[config]
-[[config.domains]]
-serviceName = "jellyseerr"
-port = 5055
-host = "${domain}"
-
-[config.env]
-TZ = "${timezone}"
-=======
 main_domain = "${domain}"

 [config]
@@ -21,4 +9,3 @@ mounts = []
 serviceName = "jellyseerr"
 port = 5055
 host = "${main_domain}"
->>>>>>> origin/canary
--- a/blueprints/privatebin/docker-compose.yml
+++ b/blueprints/privatebin/docker-compose.yml
@@ -1,24 +1,3 @@
-<<<<<<< HEAD
-version: "3.8"
-
-services:
-  privatebin:
-    image: privatebin/nginx-fpm-alpine:latest
-    restart: unless-stopped
-    read_only: true
-    expose:
-      - "8080"
-    volumes:
-      - privatebin-data:/srv/data
-    tmpfs:
-      - /tmp
-      - /var/tmp
-      - /var/run
-      - /var/lib/nginx/tmp
-
-volumes:
-  privatebin-data:
-=======
 services:
  privatebin:
    image: privatebin/nginx-fpm-alpine:2.0.4
@@ -30,4 +9,3 @@ services:

 volumes:
  privatebin_data:
->>>>>>> origin/canary
--- a/blueprints/privatebin/privatebin.svg
+++ b/blueprints/privatebin/privatebin.svg
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120"><rect width="120" height="120" rx="24" fill="#111827"/><path d="M36 28h35l15 15v49H36z" fill="#f9fafb"/><path d="M71 28v16h15" fill="#d1d5db"/><path d="M46 58h28M46 70h28M46 82h18" stroke="#111827" stroke-width="6" stroke-linecap="round"/></svg>
-=======
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
  <rect width="128" height="128" rx="28" fill="#101828"/>
  <circle cx="64" cy="64" r="34" fill="#38bdf8" opacity="0.92"/>
  <text x="64" y="74" text-anchor="middle" font-family="Arial, sans-serif" font-size="30" font-weight="700" fill="#ffffff">P</text>
 </svg>
->>>>>>> origin/canary
--- a/blueprints/privatebin/template.toml
+++ b/blueprints/privatebin/template.toml
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-[config]
-[[config.domains]]
-serviceName = "privatebin"
-port = 8080
-host = "${domain}"
-=======
 [variables]
 main_domain = "${domain}"

@@ -16,4 +9,3 @@ mounts = []
 serviceName = "privatebin"
 port = 8080
 host = "${main_domain}"
->>>>>>> origin/canary
--- a/blueprints/speedtest-tracker/docker-compose.yml
+++ b/blueprints/speedtest-tracker/docker-compose.yml
@@ -1,30 +1,7 @@
-<<<<<<< HEAD
-version: "3.8"
-
-=======
->>>>>>> origin/canary
 services:
  speedtest-tracker:
    image: lscr.io/linuxserver/speedtest-tracker:latest
    restart: unless-stopped
-<<<<<<< HEAD
-    expose:
-      - "80"
-    environment:
-      - APP_KEY
-      - APP_URL
-      - DB_CONNECTION
-      - PUID
-      - PGID
-      - TZ
-      - DISPLAY_TIMEZONE
-      - SPEEDTEST_SCHEDULE
-    volumes:
-      - speedtest-tracker-config:/config
-
-volumes:
-  speedtest-tracker-config:
-=======
    environment:
      PUID: ${PUID}
      PGID: ${PGID}
@@ -37,4 +14,3 @@ volumes:

 volumes:
  speedtest_config:
->>>>>>> origin/canary
--- a/blueprints/speedtest-tracker/speedtest-tracker.svg
+++ b/blueprints/speedtest-tracker/speedtest-tracker.svg
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120"><rect width="120" height="120" rx="24" fill="#ef4444"/><path d="M28 76a36 36 0 1 1 64 0" fill="none" stroke="#fff" stroke-width="10" stroke-linecap="round"/><path d="M60 69 82 43" stroke="#fff" stroke-width="8" stroke-linecap="round"/><circle cx="60" cy="76" r="7" fill="#fff"/></svg>
-=======
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
  <rect width="128" height="128" rx="28" fill="#101828"/>
  <circle cx="64" cy="64" r="34" fill="#38bdf8" opacity="0.92"/>
  <text x="64" y="74" text-anchor="middle" font-family="Arial, sans-serif" font-size="30" font-weight="700" fill="#ffffff">S</text>
 </svg>
->>>>>>> origin/canary
--- a/blueprints/speedtest-tracker/template.toml
+++ b/blueprints/speedtest-tracker/template.toml
@@ -1,36 +1,16 @@
 [variables]
 main_domain = "${domain}"
-<<<<<<< HEAD
-app_key = "base64:${base64:32}"
-timezone = "Etc/UTC"
-
-[config]
-env = [
-  "APP_KEY=${app_key}",
-  "APP_URL=https://${main_domain}",
-  "DB_CONNECTION=sqlite",
-  "PUID=1000",
-  "PGID=1000",
-  "TZ=${timezone}",
-  "DISPLAY_TIMEZONE=${timezone}",
-  "SPEEDTEST_SCHEDULE=0 */6 * * *",
-]
-=======
 app_key = "${base64:32}"

 [config]
 mounts = []
->>>>>>> origin/canary

 [[config.domains]]
 serviceName = "speedtest-tracker"
 port = 80
 host = "${main_domain}"
-<<<<<<< HEAD
-=======

 [config.env]
 APP_KEY = "base64:${app_key}"
 PUID = "1000"
 PGID = "1000"
->>>>>>> origin/canary