package myproject1;

public class HelloWorld {
	public static void main(String[] args) {
		System.out.print("Practice git.");
		System.out.print("Hello World!");
		System.out.print("日本語を追加！");
<<<<<<< HEAD
		System.out.print("ほげほげーふがふが");
=======
		System.out.print("ほげほげああああああ");
>>>>>>> branch 'master' of https://github.com/yukoga/myproject1.git
	}
}

@@ -190,21 +190,8 @@
 %22);%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 %09%09Sy
@@ -223,118 +223,8 @@
 %22);%0A
-=======%0A%09%09System.out.print(%22%E3%81%BB%E3%81%92%E3%81%BB%E3%81%92%E3%81%82%E3%81%82%E3%81%82%E3%81%82%E3%81%82%E3%81%82%22);%0A%3E%3E%3E%3E%3E%3E%3E branch 'master' of https://github.com/yukoga/myproject1.git%0A
 %09%7D%0A%7D

fix error.