Merge remote-tracking branch 'origin/master' into h-fuji2

Fork: 0

nitta-lab / GitTest

Browse code Merge remote-tracking branch 'origin/master' into h-fuji2 Conflicts: GitTest/src/Main.java master
commit aa370c91185038a8c8fbe0403ee6d6e03b13b21a 2 parents c8c9cfd + 778b7e6 student authored on 25 Oct 2018

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          GitTest/src/Main.java
 		System.out.println("�v�Čh�l");
		System.out.println("�X�{����(k-morimoto)");
		System.out.println("����V(h-fuji)");
		System.out.println("���V�m��(t-sugisawa)");
		System.out.println("�ݖ{���");
		System.out.println("�ݖ{���(t-kisimoto)");
	}
 
}
 		System.out.println("�v�Čh�l");
 		System.out.println("�X�{����(k-morimoto)");
 		System.out.println("����V(h-fuji)");
 		System.out.println("���V�m��(t-sugisawa)");
+		System.out.println("�ݖ{���");
+		System.out.println("�ݖ{���(t-kisimoto)");
 	}
 }

Show line notes below