From baa091f19e5c63c2589ec6842dd4657949d6efc2 Mon Sep 17 00:00:00 2001
From: "GYP\\54194" <gaoyunpeng@xinje.cc>
Date: Tue, 8 Jul 2025 08:42:09 +0800
Subject: [PATCH] no message

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index a66fbe0..d3cf9bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 需要忽略.txt
+<<<<<<< HEAD
 停止跟踪.txt
+=======
+>>>>>>> no message