From 1e8e52ce8d0b564a8dd218179427d524678f8974 Mon Sep 17 00:00:00 2001
From: YuanNiancai <yuanniancai@formulas.cc>
Date: Fri, 16 Jan 2026 20:06:29 +0800
Subject: [PATCH] Resolved package-lock.json merge conflicts by accepting main
 branch

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index dc7b5bf..a5d490d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47,7 +47,7 @@
         "mime-types": "^3.0.1",
         "multer": "^2.0.1",
         "node-fetch": "^2.7.0",
-        "node-pty": "^1.1.0",
+        "node-pty": "^1.1.0-beta34",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-dropzone": "^14.2.3",