python-project-templates
diff --git a/‎js/package.json‎
Lines changed: 0 additions & 4 deletions b/‎js/package.json‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎js/pnpm-lock.yaml‎
Lines changed: 13 additions & 120 deletions b/‎js/pnpm-lock.yaml‎
Lines changed: 13 additions & 120 deletions
@@ -53,11 +53,7 @@
   "devDependencies": {
     "@playwright/test": "^1.59.1",
     "cpy": "^13.2.1",
-<<<<<<< before updating
     "esbuild": "^0.27.4",
-=======
-    "esbuild": "^0.27.3",
->>>>>>> after updating
     "lightningcss": "^1.29.3",
     "http-server": "^14.1.1",
     "nodemon": "^3.1.14",