From 849a9907e793fed3bb18df542090e4a1f4e4f429 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 28 八月 2023 11:58:55 +0800
Subject: [PATCH] 冲突

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

diff --git a/.gitignore b/.gitignore
index 091cb8d..86357a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,10 @@
 /platform_web/doumeeplant_admin
 
 */node_modules
+*/unpackage
 /web_standard/web
 /web_standard/doumeeplant_web
 /web_standard/.vscode
 .idea
+.DS_Store
+*.gitignore
\ No newline at end of file

--
Gitblit v1.9.3