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] 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