squash!

MythemeCloud · Oct 25, 2023 · 8507422 · 8507422
1 parent 89ea51d
commit 8507422
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -49,10 +49,7 @@
 		"postcss-import": "15.1.0",
 		"postcss-reporter": "7.0.5",
 		"postcss-url": "10.1.3",
-<<<<<<< HEAD
 		"swup": "4.4.2",
-=======
->>>>>>> upstream/main
 		"tailwindcss": "3.3.5",
 		"typescript": "5.2.2",
 		"typescript-esbuild": "0.3.0",