Resolve merge conflicts.

This commit is contained in:
jacob314
2026-02-25 19:33:56 -08:00
parent 53d64365db
commit b911fc43cf
-4
View File
@@ -68,14 +68,10 @@
"wrap-ansi": "9.0.2", "wrap-ansi": "9.0.2",
"cliui": { "cliui": {
"wrap-ansi": "7.0.0" "wrap-ansi": "7.0.0"
<<<<<<< HEAD
}
=======
}, },
"glob": "^12.0.0", "glob": "^12.0.0",
"node-domexception": "npm:empty@^0.10.1", "node-domexception": "npm:empty@^0.10.1",
"prebuild-install": "npm:nop@1.0.0" "prebuild-install": "npm:nop@1.0.0"
>>>>>>> 812794a47 (Update packages. (#20152))
}, },
"bin": { "bin": {
"gemini": "bundle/gemini.js" "gemini": "bundle/gemini.js"