From 4edde649729a32893f3ce47ab03b105ba73b7b88 Mon Sep 17 00:00:00 2001
From: "Nikola R. Hristov" <nikola@playform.cloud>
Date: Thu, 2 May 2024 04:24:26 +0300
Subject: [PATCH] squash!

---
 package.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package.json b/package.json
index 58da99b..e9b456e 100644
--- 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",