conflict resolved

luanma
2025-01-02 23:26:07 +08:00 · 2025-01-02 23:19:57 +08:00
1 changed files with 1 additions and 1 deletions
--- a/HelloWorld.java
+++ b/HelloWorld.java
@ -1,5 +1,5 @@
 public class HelloWorld {
     public static void main(String[] args) {
-         System.out.println("Hello tian!!!");
+         System.out.println("jfaldjaljdajlad");
     }
 }
Author	SHA1	Message	Date
biginflation	cf91111056	conflict resolved	2025-01-02 23:26:07 +08:00
biginflation	38d6fbc00c	luanma	2025-01-02 23:19:57 +08:00