jaxxstorm
diff --git a/‎package-lock.json
Lines changed: 0 additions & 6 deletions b/‎package-lock.json
Lines changed: 0 additions & 6 deletions
diff --git a/‎package.json
Lines changed: 0 additions & 6 deletions b/‎package.json
Lines changed: 0 additions & 6 deletions
@@ -31,13 +31,7 @@
   "devDependencies": {
     "@types/lodash": "^4.17.16",
     "@types/node": "^20.17.6",
-<<<<<<< HEAD
     "@vercel/ncc": "^0.38.3",
-    "typescript": "^4.9.4"
-||||||| 4304621
-    "typescript": "^4.9.4"
-=======
     "typescript": "^5.8.3"
->>>>>>> master
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,7 @@`
`31`	`31`	`"devDependencies": {`
`32`	`32`	`"@types/lodash": "^4.17.16",`
`33`	`33`	`"@types/node": "^20.17.6",`
`34`		`-<<<<<<< HEAD`
`35`	`34`	`"@vercel/ncc": "^0.38.3",`
`36`		`- "typescript": "^4.9.4"`
`37`		`-\|\|\|\|\|\|\| 4304621`
`38`		`- "typescript": "^4.9.4"`
`39`		`-=======`
`40`	`35`	`"typescript": "^5.8.3"`
`41`		`->>>>>>> master`
`42`	`36`	`}`
`43`	`37`	`}`