mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-07-04 07:07:16 -07:00
Resolve merge conflicts.
This commit is contained in:
@@ -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"
|
||||||
|
|||||||
Reference in New Issue
Block a user