From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9b4982a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+gz-customerSystem/build.zip
+gz-customerSystem/package-lock.json

--
Gitblit v1.8.0