From b911fc43cfca9bdbabe26f4b2cc013fa8cf544b4 Mon Sep 17 00:00:00 2001
From: jacob314 <jacob314@gmail.com>
Date: Wed, 25 Feb 2026 19:33:56 -0800
Subject: [PATCH] Resolve merge conflicts.

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

diff --git a/package.json b/package.json
index 8feb6ce16c..6beca279aa 100644
--- a/package.json
+++ b/package.json
@@ -68,14 +68,10 @@
     "wrap-ansi": "9.0.2",
     "cliui": {
       "wrap-ansi": "7.0.0"
-<<<<<<< HEAD
-    }
-=======
     },
     "glob": "^12.0.0",
     "node-domexception": "npm:empty@^0.10.1",
     "prebuild-install": "npm:nop@1.0.0"
->>>>>>> 812794a47 (Update packages. (#20152))
   },
   "bin": {
     "gemini": "bundle/gemini.js"