From 40e7bf9143f35c4dcf3cc37ab3f9bae8855e7763 Mon Sep 17 00:00:00 2001
From: "Huang, Xinshengzi" <xinshengzi.huang@intel.com>
Date: Sun, 7 Jan 2024 23:46:26 +0800
Subject: [PATCH] fix conflit

---
 test/test.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test.txt b/test/test.txt
index 937982a..4688c98 100644
--- a/test/test.txt
+++ b/test/test.txt
@@ -1,2 +1,3 @@
+hello, world!!!!
 hello, world
-hello, world
\ No newline at end of file
+