Merge branch 'dev' of http://gitea.xinje.cc/fuchunyang/check into dev

# Conflicts: # 2.txt
no message
--- a/1.txt
+++ b/1.txt
@@ -1 +1 @@
 1122
 11122
--- a/2.txt
+++ b/2.txt
@@ -1 +1,2 @@
 2233
 22345
 123
--- a/6.txt
+++ b/6.txt
--- a/patch.diff
+++ b/patch.diff
@@ -0,0 +1,22 @@
 From eb19683a995db1d7314ee0459b507d04f4131f52 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E4=BB=98=E6=98=A5=E9=98=B3?= <2715725160@qq.com>
 Date: Tue, 15 Jul 2025 16:29:37 +0800
 Subject: [PATCH] no message

 ---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

 diff --git a/.gitignore b/.gitignore
 new file mode 100644
 index 0000000..2846a68
 --- /dev/null
 +++ b/.gitignore
@@ -0,0 +1,2 @@
 +2.txt
 +5.txt
 \ No newline at end of file
 -- 
 2.33.1.windows.1
作成者	SHA1	メッセージ	日付
付春阳	12ec2b7358	Merge branch 'dev' of http://gitea.xinje.cc/fuchunyang/check into dev # Conflicts: # 2.txt	2週間前
付春阳	a0dde882a3	no message	2週間前
春阳付	4704e02f48	更新 '2.txt'	2週間前
付春阳	89433c6638	no message	2週間前
付春阳	71e47c474a	no message	2週間前
付春阳	0cb788a3eb	Revert "no message" This reverts commit `46b105af16`.	2週間前
付春阳	46b105af16	no message	2週間前
付春阳	037d3fae6a	no message	2週間前
付春阳	428d07f3b6	no message	2週間前
付春阳	86d064c431	no message	2週間前