Skip to content

Commit 922ed36

Browse files
committed
Fix merge conflict in package.json: resolve @dyad-sh/supabase-management-js version to 1.0.0
1 parent 5788761 commit 922ed36

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

package-lock.json

Lines changed: 1 addition & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,7 @@
9595
"@ai-sdk/provider-utils": "^3.0.3",
9696
"@ai-sdk/xai": "^2.0.16",
9797
"@biomejs/biome": "^1.9.4",
98-
<<<<<<< HEAD
99-
"@dyad-sh/supabase-management-js": "v1.0.0",
100-
=======
101-
"@dyad-sh/supabase-management-js": "^1.0.0",
102-
>>>>>>> release/v0.0.5
98+
"@dyad-sh/supabase-management-js": "1.0.0",
10399
"@lexical/react": "^0.33.1",
104100
"@monaco-editor/react": "^4.7.0-rc.0",
105101
"@neondatabase/api-client": "^2.1.0",

0 commit comments

Comments
 (0)