Browse Source

更新 'src/HiGit.java'

陈俊森 3 years ago
parent
commit
80aaaedf9a
1 changed files with 1 additions and 7 deletions
  1. 1 7
      src/HiGit.java

+ 1 - 7
src/HiGit.java

@@ -1,15 +1,9 @@
 public class HiGit {
     public static void main(String[] args) {
-<<<<<<<<< Temporary merge branch 1
         System.out.println("111111");
         System.out.println("111111");
         System.out.println("111111");
         System.out.println("111111");
-=========
-        System.out.println("HiGit");
-      System.out.println("HiGit");
-      System.out.println("HiGit");
-     
->>>>>>>>> Temporary merge branch 2
+
     }
 }