Merge branch 'b1'

lilongjie · lilongjie · commit b88adbc8b312 · 2019-02-12T16:50:53.000+08:00
merge master and b1
diff --git a/branch-b1.readme b/branch-b1.readme
@@ -0,0 +1,2 @@
+this is instruction book of branch b1
+
diff --git a/something.txt b/something.txt
@@ -0,0 +1 @@
+I am coding!

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+this is instruction book of branch b1`
	`2`	`+`