Skip to content

Commit 9e32f8b

Browse files
Resolved conflict in yarn.lock
1 parent 4f4ea03 commit 9e32f8b

File tree

1 file changed

+2
-35
lines changed

1 file changed

+2
-35
lines changed

web/yarn.lock

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ __metadata:
15431543
"@codemirror/state": ^6.0.0
15441544
"@codemirror/view": ^6.0.0
15451545
crelt: ^1.0.5
1546-
checksum: 4d418f176bd93705bc51c82a2f1c0e41fecc0368dc43c415635c4dfdd763aa05ebdf7f000bc9ca0083c1887e6d305b89482ec1f4db8b8765c6f38de324187476
1546+
checksum: a30048004ce7cc1ee77a7618485ab5399939eab72b64329d57be98245ea39cb68ba54ad944ee679cc2aeac5bf9f202b2073ad0916f0788497fb64a07073399e8
15471547
languageName: node
15481548
linkType: hard
15491549

@@ -3869,16 +3869,6 @@ __metadata:
38693869
languageName: node
38703870
linkType: hard
38713871

3872-
"accepts@npm:^2.0.0":
3873-
version: 2.0.0
3874-
resolution: "accepts@npm:2.0.0"
3875-
dependencies:
3876-
mime-types: ^3.0.0
3877-
negotiator: ^1.0.0
3878-
checksum: 49fe6c050cb6f6ff4e771b4d88324fca4d3127865f2473872e818dca127d809ba3aa8fdfc7acb51dd3c5bade7311ca6b8cfff7015ea6db2f7eb9c8444d223a4f
3879-
languageName: node
3880-
linkType: hard
3881-
38823872
"acorn-globals@npm:^7.0.0":
38833873
version: 7.0.1
38843874
resolution: "acorn-globals@npm:7.0.1"
@@ -3934,7 +3924,7 @@ __metadata:
39343924
languageName: node
39353925
linkType: hard
39363926

3937-
"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.12.1, acorn@npm:^8.14.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2":
3927+
"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.12.1, acorn@npm:^8.14.0, acorn@npm:^8.8.1":
39383928
version: 8.14.1
39393929
resolution: "acorn@npm:8.14.1"
39403930
bin:
@@ -9069,13 +9059,6 @@ __metadata:
90699059
languageName: node
90709060
linkType: hard
90719061

9072-
"is-promise@npm:^4.0.0":
9073-
version: 4.0.0
9074-
resolution: "is-promise@npm:4.0.0"
9075-
checksum: 0b46517ad47b00b6358fd6553c83ec1f6ba9acd7ffb3d30a0bf519c5c69e7147c132430452351b8a9fc198f8dd6c4f76f8e6f5a7f100f8c77d57d9e0f4261a8a
9076-
languageName: node
9077-
linkType: hard
9078-
90799062
"is-reference@npm:^3.0.3":
90809063
version: 3.0.3
90819064
resolution: "is-reference@npm:3.0.3"
@@ -16363,22 +16346,6 @@ __metadata:
1636316346
languageName: node
1636416347
linkType: hard
1636516348

16366-
"zod-to-json-schema@npm:^3.24.1":
16367-
version: 3.24.5
16368-
resolution: "zod-to-json-schema@npm:3.24.5"
16369-
peerDependencies:
16370-
zod: ^3.24.1
16371-
checksum: dc4e5e4c06e9a5494e4b1d8c8363ac907f9d488f36c8e4923e1e5ac4f91f737722f99200cd92a409551e7456d960734d4cabd37935234ca95e290572468ffc08
16372-
languageName: node
16373-
linkType: hard
16374-
16375-
"zod@npm:^3.23.8, zod@npm:^3.24.2":
16376-
version: 3.24.4
16377-
resolution: "zod@npm:3.24.4"
16378-
checksum: 62829789765a9187bd72bed3972a7c1a39fdfe6c59bc752eedabec5f99af701658471b8577d22e0fee2081e6e35d4efc93c02c90e13350755a36feadbf72bbbc
16379-
languageName: node
16380-
linkType: hard
16381-
1638216349
"zustand@npm:^5.0.3":
1638316350
version: 5.0.4
1638416351
resolution: "zustand@npm:5.0.4"

0 commit comments

Comments
 (0)