From f815369d13e6ddc8762c48054a9df390eb3d71c8 Mon Sep 17 00:00:00 2001
From: fl0werpowers <47599466+fl0werpowers@users.noreply.github.com>
Date: Mon, 31 Mar 2025 23:59:02 +0200
Subject: [PATCH] Resolve package.json-related conflicts

---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0886b26a0..15a3403fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,7 +57,7 @@
         "remark-rehype": "^11.1.1",
         "remark-smartypants": "^3.0.2",
         "rfdc": "^1.4.1",
-        "satori": "^0.12.1",
+        "satori": "^0.12.2",
         "serve-handler": "^6.1.6",
         "sharp": "^0.33.5",
         "shiki": "^1.26.2",
@@ -6308,9 +6308,10 @@
       }
     },
     "node_modules/satori": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/satori/-/satori-0.12.1.tgz",
-      "integrity": "sha512-0SbjchvDrDbeXeQgxWVtSWxww7qcFgk3DtSE2/blHOSlLsSHwIqO2fCrtVa/EudJ7Eqno8A33QNx56rUyGbLuw==",
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/satori/-/satori-0.12.2.tgz",
+      "integrity": "sha512-3C/laIeE6UUe9A+iQ0A48ywPVCCMKCNSTU5Os101Vhgsjd3AAxGNjyq0uAA8kulMPK5n0csn8JlxPN9riXEjLA==",
+      "license": "MPL-2.0",
       "dependencies": {
         "@shuding/opentype.js": "1.4.0-beta.0",
         "css-background-parser": "^0.1.0",
diff --git a/package.json b/package.json
index 2d09ea446..496014229 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "remark-rehype": "^11.1.1",
     "remark-smartypants": "^3.0.2",
     "rfdc": "^1.4.1",
-    "satori": "^0.12.1",
+    "satori": "^0.12.2",
     "serve-handler": "^6.1.6",
     "sharp": "^0.33.5",
     "shiki": "^1.26.2",