From 4813541dd8ceb872d627610dc62ee57d73eca0e9 Mon Sep 17 00:00:00 2001
From: yanghang <yanghang@qq.com>
Date: Sun, 22 Sep 2024 23:31:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 046a206b..1e85d5fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,22 +6,11 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
-<<<<<<< HEAD
-
-=======
-pnpm-lock.yaml
-package-lock.yaml
->>>>>>> develop
 node_modules
 dist
 dist-ssr
 *.local
-<<<<<<< HEAD
 pnpm-lock.yaml
-=======
-lib
-
->>>>>>> develop
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
@@ -32,11 +21,5 @@ lib
 *.njsproj
 *.sln
 *.sw?
-<<<<<<< HEAD
-stats.html
 cache
 lib
-=======
-cache
-
->>>>>>> develop