From afdeea0420a08291ce498f85a4295100eed27e98 Mon Sep 17 00:00:00 2001
From: Dominik Stumpf <s.dominik.work@gmail.com>
Date: Fri, 22 Nov 2024 01:28:48 +0100
Subject: [PATCH] chore: resolve merge conflict

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dfb19eb106..1caacdcb5f 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "foxact": "^0.2.41",
-    "jotai": "^2.10.3",
+    "jotai": "^2.10.2",
     "next": "15.0.3",
     "next-themes": "^0.4.3",
     "react": "19.0.0-rc-66855b96-20241106",