Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: muralibasani <[email protected]>
  • Loading branch information
muralibasani committed Dec 11, 2023
2 parents dadfea0 + b098767 commit 847f9d8
Show file tree
Hide file tree
Showing 5 changed files with 312 additions and 164 deletions.
10 changes: 5 additions & 5 deletions coral/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"dependencies": {
"@aivenio/aquarium": "^1.48.1",
"@hookform/resolvers": "^2.9.10",
"@monaco-editor/react": "^4.5.2",
"@monaco-editor/react": "^4.6.0",
"@tanstack/react-query": "^4.29.5",
"@types/react-syntax-highlighter": "^15.5.9",
"monaco-editor": "^0.44.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.48.2",
"react-markdown": "^8.0.7",
"react-router-dom": "^6.10.0",
"react-router-dom": "^6.20.1",
"react-syntax-highlighter": "^15.5.0",
"rehype-parse": "^9.0.0",
"rehype-remark": "^10.0.0",
Expand All @@ -75,7 +75,7 @@
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-react": "^4.1.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.6.1",
Expand All @@ -87,10 +87,10 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-transform-stub": "^2.0.0",
"lint-staged": "^15.1.0",
"lint-staged": "^15.2.0",
"lodash": "^4.17.21",
"msw": "^2.0.9",
"openapi-typescript": "^6.7.0",
"openapi-typescript": "^6.7.2",
"prettier": "^3.1.0",
"prop-types": "^15.8.1",
"react-aria": "^3.30.0",
Expand Down
Loading

0 comments on commit 847f9d8

Please sign in to comment.