Merge pull request #49 from kmc-jp/conflict-toruyoh

nakario · nakario · commit ad3a1c072efd · 2016-05-17T20:41:20.000+09:00
hoge.textを変更
diff --git a/hoge.txt b/hoge.txt
@@ -1,16 +1,22 @@
-﻿﻿﻿hogehoge
+﻿﻿﻿﻿hogehoge
 hoge!?hogehoge!hoge!!hoge!!!!
 qawsedrftgyhujikolp;@
 くぁｗせｄｒｆｔｇｙふじこｌｐ
 ああ
 
+dakjfsd
+ajaodsia
+
 qwertyu
 asdf
 ghjk
 
 afiuejn
 amscpinefpaf
 
+qsqjidjwd
+qdodpw
+
 vapenvapvnp
 
 avoopernpav
