From 9bf6765454bc17ca1c4c80afcd8b0189223a30ea Mon Sep 17 00:00:00 2001
From: wangxinyu <2788673683@qq.com>
Date: Thu, 10 Jul 2025 17:10:52 +0800
Subject: [PATCH 1/3] dont_now

---
 hello.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hello.c b/hello.c
index ab36fb6..002e030 100644
--- a/hello.c
+++ b/hello.c
@@ -2,14 +2,12 @@
 
 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");
+    printf("helloworld\n");
+    printf("haode\n");
     return 0;    
 }
\ No newline at end of file

From 43a89e995d8f9a4cf523e6a74889b6035f35c14f Mon Sep 17 00:00:00 2001
From: wangxinyu <2788673683@qq.com>
Date: Thu, 10 Jul 2025 19:48:01 +0800
Subject: [PATCH 2/3] Revert "Merge branch 'out_double' of
 http://gitea.xinje.cc/wangxinyu2/test into out_double"

This reverts commit 8d5b97c9ea9df000afb09341c9054d31ce9b8b6f, reversing
changes made to 9a380c2f9eb5f44aac15387e7a32293e8fb9ccaa.
---
 hello.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hello.c b/hello.c
index 002e030..a01d4d9 100644
--- a/hello.c
+++ b/hello.c
@@ -5,7 +5,7 @@ void main()
     printf("hello world\n");
     printf("hello world\n");
     printf("hello world\n");
-    printf("hello world\n");
+    printf("hello\n");
     printf("nihao\n");
     printf("helloworld\n");
     printf("haode\n");

From a295d0ac6f8550820fe87b1e573b59e30f0c4842 Mon Sep 17 00:00:00 2001
From: wangxinyu <2788673683@qq.com>
Date: Fri, 11 Jul 2025 12:52:01 +0800
Subject: [PATCH 3/3] change_reset

---
 hello.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hello.c b/hello.c
index 002e030..055f69b 100644
--- a/hello.c
+++ b/hello.c
@@ -5,9 +5,9 @@ void main()
     printf("hello world\n");
     printf("hello world\n");
     printf("hello world\n");
-    printf("hello world\n");
+    printf("hello\n");
     printf("nihao\n");
-    printf("helloworld\n");
+    printf("你好\n");
     printf("haode\n");
     return 0;    
 }
\ No newline at end of file