Merge remote-tracking branch 'refs/remotes/origin/master' into conflict-amool

gnu-kmc · gnu-kmc · commit c0e2df81e1e2 · 2016-05-17T19:57:26.000+09:00
# Conflicts:
#	hoge.txt
diff --git a/amool2.md b/amool2.md
@@ -0,0 +1,5 @@
+﻿git自立
+
+test
+テスト
+てすと
diff --git a/gnu.md b/gnu.md
@@ -0,0 +1,4 @@
+﻿日本語
+hogehgoe
+
+テスト！！！
diff --git a/gurisuke.md b/gurisuke.md
@@ -0,0 +1,4 @@
+﻿みんなでゲーム
+
+
+テスト!!!
diff --git a/gurisuke2.md b/gurisuke2.md
@@ -0,0 +1,3 @@
+﻿てすとおおおおおおおおおおおおお　２
+
+へんこおおおおおおおおおおおおおおおおおおおおおお
diff --git a/haji82.md b/haji82.md
@@ -0,0 +1,4 @@
+﻿ああああああああ
+テスト
+みんゲー
+変更後
diff --git a/hoge.txt b/hoge.txt
@@ -1,2 +1,11 @@
-﻿hogehoge
-qawsedrftgyhujikolp;@
+﻿﻿hogehoge
+hoge!?hogehoge!hoge!!hoge!!!!
+qawsedrftgyhujikolp;@
+
+afiuejn
+amscpinefpaf
+
+vapenvapvnp
+
+avoopernpav
+amvpriep
diff --git a/kazuma.md b/kazuma.md
@@ -0,0 +1,5 @@
+﻿mige-
+test
+hogehoge
+
+テスト！！！
diff --git a/opesan-md2.txt b/opesan-md2.txt
@@ -0,0 +1,3 @@
+﻿ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰ
+ＱＲＳＴＵＶ
+ＷＸＹＺ
diff --git a/opesan.md.txt b/opesan.md.txt
@@ -0,0 +1,6 @@
+﻿opesan
+
+h
+o
+g
+e

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +みんなでゲーム
++
++
 +テスト!!!
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+てすとおおおおおおおおおおおおお　２`
	`2`	`+`
	`3`	`+へんこおおおおおおおおおおおおおおおおおおおおおお`