Fix rebase and bump sparkle

dust-tt · Nov 3, 2023 · 86fe01d · 86fe01d
1 parent 37c2edb
commit 86fe01d
Show file tree

Hide file tree

Showing 2 changed files with 121 additions and 13 deletions.
diff --git a/front/package-lock.json b/front/package-lock.json
diff --git a/front/package.json b/front/package.json
@@ -13,15 +13,7 @@
     "initdb": "env $(cat .env.local) npx tsx admin/db.ts"
   },
   "dependencies": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "@dust-tt/sparkle": "^0.2.31",
-=======
-    "@dust-tt/sparkle": "^0.2.28",
->>>>>>> f3358ed4 (wip)
-=======
-    "@dust-tt/sparkle": "^0.2.29",
->>>>>>> 563c2d1c (Moving to Sparkle29)
+    "@dust-tt/sparkle": "^0.2.32",
     "@emoji-mart/data": "^1.1.2",
     "@emoji-mart/react": "^1.1.1",
     "@headlessui/react": "^1.7.7",