From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突

---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 78a752d..507b2dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 yarn-debug.log*
 yarn-error.log*
 **/*.log
+pnpm-lock.yaml
 
 tests/**/coverage/
 tests/e2e/reports

--
Gitblit v1.8.0