Merge branch 'Current' of ssh://github.com/Playform/ConvertAstro into…

… Current
PlayForm · Mar 28, 2024 · 36103f4 · 36103f4
1 parent 767c89c
commit 36103f4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -36,11 +36,7 @@
 		"files-pipe": "2.1.16"
 	},
 	"devDependencies": {
-<<<<<<< HEAD
 		"typescript-document": "0.0.7",
-=======
-		"typescript-document": "0.0.6",
->>>>>>> 92f163970f587ec9fd81d4e333cdde9f214f7a5e
 		"typescript-esbuild": "0.4.9"
 	},
 	"publishConfig": {