Merge branch 'master' into change

laboone · laboone · commit 7b634cf8dc45 · 2016-08-29T17:52:29.000+09:00
diff --git a/hoge.txt b/hoge.txt
@@ -3,4 +3,6 @@
 3
 3
 
-hoge master
+hoge master
+
+1
diff --git a/test1.txt b/test1.txt
@@ -7,4 +7,5 @@
 7
 8 master
 9
-10 master
+10 master
+11
