squash!

PlayForm · Oct 25, 2023 · 29e1d5d · 29e1d5d
1 parent 1ce1849
commit 29e1d5d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -55,10 +55,7 @@
 		"postcss-import": "15.1.0",
 		"postcss-reporter": "7.0.5",
 		"postcss-url": "10.1.3",
-<<<<<<< HEAD
 		"sst": "rc",
-=======
->>>>>>> upstream/main
 		"tailwindcss": "3.3.5",
 		"typescript": "5.2.2",
 		"typescript-esbuild": "0.3.0",