Merge pull request Radium98#2 from hxsz1997/main

fix conflit
hxsz1997 · Jan 7, 2024 · 71ee2a7 · 71ee2a7
2 parents f2bdcfb + 40e7bf9
commit 71ee2a7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/test/test.txt b/test/test.txt
@@ -1,2 +1,3 @@
+hello, world!!!!
 hello, world
-hello, world
+