squash!

PlayForm · Jun 11, 2024 · 0af8e8b · 0af8e8b
2 parents 7e5ce73 + 2e160cb
commit 0af8e8b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,12 @@
 		"deepmerge-ts": "7.0.3"
 	},
 	"devDependencies": {
+<<<<<<< HEAD
 		"@playform/build": "0.0.10"
+=======
+		"@playform/build": "0.0.10",
+		"@playform/document": "0.0.10"
+>>>>>>> 2e160cbbf7db3b103b567d4ad97c2cd93d9f1015
 	},
 	"publishConfig": {
 		"access": "public"