From 50bc34914fd2dc8bb66cbd71427f23d25923f286 Mon Sep 17 00:00:00 2001
From: v4ltages <contact@voltages.me>
Date: Wed, 12 Aug 2026 17:55:34 +0300
Subject: [PATCH] Fix package.json conflict

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 3d48bac..ebc2e3a 100644
--- a/package.json
+++ b/package.json
@@ -29,11 +29,7 @@
     "drizzle-orm": "^0.45.2",
     "lucide-react": "^1.31.0",
     "material-symbols": "^0.44.12",
-<<<<<<< HEAD
-    "next": "16.2.6",
-=======
     "next": "16.3.0",
->>>>>>> main
     "next-intl": "^4.13.6",
     "next-themes": "^0.4.6",
     "react": "^19.2.8",