From a239a513e1591ab18b555f402d1d15cdcaad6290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ACT=E4=B8=B6=E6=B5=81=E6=98=9F=E9=9B=A8?=
 <1340145680@qq.com>
Date: Sat, 11 Apr 2026 02:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yarn.lock | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fb61edc..3375e6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1869,14 +1869,6 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.6:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-<<<<<<< HEAD
-custom-electron-titlebar@^4.2.8:
-  version "4.4.1"
-  resolved "https://registry.npmmirror.com/custom-electron-titlebar/-/custom-electron-titlebar-4.4.1.tgz"
-  integrity sha512-I+sOGBdslrGpuCWlhda8P0vtRAZK+W2NzjHLsxTiE2bNmhAIs9YLDe6iRBExwU1xVZt+J1hSXzUT67BlAuMWLA==
-
-=======
->>>>>>> develop
 debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"