resolve merge conflict

This commit is contained in:
hardiknai-techm
2021-05-05 08:52:52 +05:30
24 changed files with 6357 additions and 789 deletions

View File

@@ -129,8 +129,8 @@
"@types/sinon": "2.3.3",
"@types/styled-components": "5.1.1",
"@types/underscore": "1.7.36",
"@typescript-eslint/eslint-plugin": "4.0.1",
"@typescript-eslint/parser": "4.0.1",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"@wojtekmaj/enzyme-adapter-react-17": "0.6.1",
"babel-jest": "24.9.0",
"babel-loader": "8.1.0",