Merge branch 'test_marge'

# Conflicts:
#	src/main/java/org/example/Main.java
master
2812875475 2024-06-10 16:13:42 +08:00
commit e8d6e8e7e7
1 changed files with 2 additions and 3 deletions

View File

@ -8,11 +8,10 @@ package org.example;
*/ */
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("hhhhhh4"); System.out.println("Hello world333333333!");
System.out.println("hhh"); System.out.println("hhh");
System.out.println("hhhhhh3"); System.out.println("hhhhhh3");
System.out.println("Hello world333333333!"); System.out.println("hhhhhh4");
} }
} }