From 0498034d98a44e2de9ae3f68aba75e3903f687a6 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 30 三月 2023 17:45:03 +0800
Subject: [PATCH] 3.30

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

diff --git a/.gitignore b/.gitignore
index ed8368a..24ebb01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ######################################################################
 # Build Tools
 
@@ -45,3 +46,28 @@
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+=======
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
+
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock
+>>>>>>> 802423e8 (3.30)

--
Gitblit v1.9.1