python-project-templates
diff --git a/‎js/package.json‎
Lines changed: 0 additions & 5 deletions b/‎js/package.json‎
Lines changed: 0 additions & 5 deletions
@@ -49,13 +49,8 @@
     "http-server": "^14.1.1",
     "nodemon": "^3.1.14",
     "npm-run-all": "^4.1.5",
-<<<<<<< before updating
-    "oxfmt": "^0.65.0",
-    "oxlint": "^1.80.0",
-=======
     "oxfmt": "^0.66.0",
     "oxlint": "^1.81.0",
->>>>>>> after updating
     "typescript": "^7.0.2"
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,8 @@`
`49`	`49`	`"http-server": "^14.1.1",`
`50`	`50`	`"nodemon": "^3.1.14",`
`51`	`51`	`"npm-run-all": "^4.1.5",`
`52`		`-<<<<<<< before updating`
`53`		`- "oxfmt": "^0.65.0",`
`54`		`- "oxlint": "^1.80.0",`
`55`		`-=======`
`56`	`52`	`"oxfmt": "^0.66.0",`
`57`	`53`	`"oxlint": "^1.81.0",`
`58`		`->>>>>>> after updating`
`59`	`54`	`"typescript": "^7.0.2"`
`60`	`55`	`}`
`61`	`56`	`}`