chore: resolve merge conflicts from v6.0.0

GetStream · Jun 7, 2024 · 0f26223 · 0f26223
2 parents 84d0745 + 7ad0442
commit 0f26223
Show file tree

Hide file tree

Showing 18 changed files with 148,118 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,10 @@
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 node_modules
 NEXT_RELEASE_CHANGELOG.md
 artifacts

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18