Resolved merge conflicts

This commit is contained in:
Andrii V 2025-11-24 15:29:54 +01:00
commit 5e477a58a2
38 changed files with 212 additions and 180 deletions

View file

@ -43,10 +43,11 @@
"html-loader": "^0.4.4",
"html-webpack-plugin": "^3.2.0",
"imports-loader": "^0.7.1",
"jquery": "1.11.3",
"install": "^0.13.0",
"jquery": "^3.7.1",
"jshint": "^2.9.1-rc3",
"luxon": "^3.7.2",
"mark.js": "8.11.1",
"moment": "^2.18.1",
"mousetrap": "^1.6.1",
"polymer-webpack-loader": "^2.0.1",
"raw-loader": "1.0.0-beta.0",