From e26b3cf3e16d44a6c26a76376e7e8383a53db90d Mon Sep 17 00:00:00 2001
From: wangxinyu <2788673683@qq.com>
Date: Mon, 14 Jul 2025 15:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.c.rej | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 hello.c.rej

diff --git a/hello.c.rej b/hello.c.rej
new file mode 100644
index 0000000..f0f81d6
--- /dev/null
+++ b/hello.c.rej
@@ -0,0 +1,15 @@
+diff a/hello.c b/hello.c	(rejected hunks)
+@@ -2,10 +2,13 @@
+ 
+ void main()
+ {
++<<<<<<< HEAD
+     printf("hello world\n");
+     printf("hello world\n");
+     printf("hello world\n");
+     printf("hello world\n");
++=======
++>>>>>>> 20bf8d7c8a17a7354dfe3d735a034ad3ffe96ba5
+     printf("nihao\n");
+     printf("helloworld");
+     return 0;