From 484bd662e2fd4461ef34dbf9d64106c12b3ef961 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:43:49 +0800
Subject: [PATCH] 冲突

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

diff --git a/.gitignore b/.gitignore
index a4af05a..3ba1c88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,7 @@
 
 # Users Environment Variables
 .lock-wscript
+.DS_Store
+package-lock.json
+.idea
+/dist

--
Gitblit v1.8.0