squash!

PlayForm · May 2, 2024 · 4edde64 · 4edde64
1 parent 910cb3b
commit 4edde64
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -29,15 +29,9 @@
 		"solid-js": "1.8.17"
 	},
 	"devDependencies": {
-<<<<<<< HEAD
-		"@playform/build": "0.0.7",
-		"@tauri-apps/cli": "2.0.0-beta.13",
-		"@types/node": "20.12.7",
-=======
 		"@playform/build": "0.0.8",
 		"@tauri-apps/cli": "2.0.0-beta.15",
 		"@types/node": "20.12.8",
->>>>>>> b9080d333b3f88b3c55f07c76e251ef45f547ff1
 		"autoprefixer": "10.4.19",
 		"cssnano": "7.0.1",
 		"cssnano-preset-advanced": "7.0.1",