From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 06 八月 2025 10:15:12 +0800
Subject: [PATCH] :测试提交“

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

diff --git a/.gitignore b/.gitignore
index f387781..ae97830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,20 @@
 ######################################################################
+<<<<<<< HEAD
+# Build Tools
+
+/unpackage/*
+
+######################################################################
+# Development Tools
+
+/.idea/*
+/.vscode/*
+/.hbuilderx/*
+
+package-lock.json
+yarn.lock
+
+=======
 # Node & Package Manager
 
 node_modules/
@@ -65,3 +81,4 @@
 /coverage/
 /reports/
 /*.lcov
+>>>>>>> master

--
Gitblit v1.8.0