Skip to content

Commit

Permalink
fix: fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
meenakshi-deriv committed Jan 11, 2024
1 parent d53ada6 commit 22f5a72
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"dependencies": {
"@artsy/fresnel": "^6.2.1",
"@builder.io/partytown": "^0.8.1",
"@deriv-com/blocks": "^0.70.0",
"@deriv-com/components": "^0.41.0",
"@deriv-com/blocks": "^0.72.0",
"@deriv-com/components": "^0.42.0",
"@deriv-com/hooks": "^0.10.0",
"@deriv-com/providers": "^0.10.0",
"@deriv/analytics": "^1.4.4",
"@deriv/deriv-api": "^1.0.13",
"@deriv/quill-design": "^1.3.2",
"@deriv/quill-design": "^1.2.16",
"@deriv/quill-icons": "^1.1.10",
"@hookform/resolvers": "^3.3.2",
"@livechat/customer-sdk": "^3.1.5",
Expand Down

0 comments on commit 22f5a72

Please sign in to comment.