From b342b58f581244636360001ca24a42853f56ebb7 Mon Sep 17 00:00:00 2001
From: pmy <952201925@qq.com>
Date: Mon, 13 May 2024 16:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3npm=E5=92=8Cyarn=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因：yarn.lock和package-lock.json文件冲突

Signed-off-by: pmy <952201925@qq.com>
---
 1.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 1.txt

diff --git a/1.txt b/1.txt
deleted file mode 100644
index e69de29..0000000