Merge branch 'develop' into feat-srr-mobile-ux

bitcashorg · Apr 9, 2024 · 0dfd91c · 0dfd91c
2 parents 07398ae + ab67184
commit 0dfd91c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,11 @@
 node_modules
 .turbo
 .DS_Store
+<<<<<<< HEAD
 __dev
-.vercel
+.vercel
+=======
+_dev
+.vercel
+__dev
+>>>>>>> develop
diff --git a/bun.lockb b/bun.lockb