gabehf/sqm-dashboards
1
0
Fork 0
mirror of https://github.com/edcommonwealth/sqm-dashboards.git synced 2026-03-09 07:28:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: merge conflicts in package.json were causing build to fail. Fixed merge conflicts

Browse source
This commit is contained in:
Nelson Jovel 2023-06-28 21:24:18 -07:00
parent 4c2e3511f0
commit f180275b67
3 changed files with 156 additions and 4337 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -17,14 +17,9 @@
"babel-preset-es2015": "^6.24.1",
"bootstrap": "^5.1.3",
"debounce": "^1.2.1",
<<<<<<< HEAD
"esbuild": "^0.13.6",
"sass": "^1.43.4"
=======
"esbuild": "^0.17.12",
"sass": "^1.43.4",
"semver": "7.5.2"
>>>>>>> eaef648 (upgraded semver to 7.5.2 and adding updated files package.json and yarn.lock)
},
"scripts": {
"build": "esbuild app/javascript/*.* --bundle --outdir=app/assets/builds",