From f24b408676fad8879f7ff2d12268e3e96873c924 Mon Sep 17 00:00:00 2001
From: wangxinyu <2788673683@qq.com>
Date: Mon, 7 Jul 2025 17:11:32 +0800
Subject: [PATCH] add_newFile

---
 hello.c      | 0
 note/tesk.md | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 hello.c

diff --git a/hello.c b/hello.c
new file mode 100644
index 0000000..e69de29
diff --git a/note/tesk.md b/note/tesk.md
index 59f50d7..98e2ca9 100644
--- a/note/tesk.md
+++ b/note/tesk.md
@@ -10,4 +10,6 @@
 ~~~
 
 #### 表格
-
+~~~
+添加冲突
+~~~