marge master conflict

This commit is contained in:
hardiknai-techm
2021-04-28 19:58:09 +05:30
94 changed files with 40196 additions and 9692 deletions

View File

@@ -178,7 +178,7 @@
"typescript": "4.2.4",
"url-loader": "1.1.1",
"wait-on": "4.0.2",
"webpack": "4.43.0",
"webpack": "4.46.0",
"webpack-bundle-analyzer": "3.6.1",
"webpack-cli": "3.3.10",
"webpack-dev-server": "3.11.0"