chore: solve merge conflict #1931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

2heal1 merged 37 commits into canary from chore/solve-merge-conflict

Jan 8, 2024

package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ @@
         "adm-zip": "0.5.10",
         "ansi-colors": "4.1.3",
         "antd": "4.24.15",
-        "axios": "1.6.3",
+        "axios": "1.6.5",
         "core-js": "3.34.0",
         "encoding": "^0.1.13",
         "express": "4.18.2",
@@ Expand Down @@

pnpm-lock.yaml

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