lihai add
baiizying add a line
a file add by baiziying
by lihai Merge branch 'master' of https://github.com/pinguo-baiziying/lession1 into pinguo-baiziying-master

Conflicts:
	lession.txt
add a line by baiziying
lihai
Merge pull request #9 from pinguo-shenqiang/master

解决冲突
create conflict
baiziying Merge remote-tracking branch 'lihai/master'

Conflicts:
	lession.txt
add a line 2
Merge pull request #2 from pinguo-baiziying/master

baiziying add a line
Merge branch 'master' of https://github.com/pinguo-liuhongwei/lession1 into hotfix
还原文件
by lihai
Merge remote-tracking branch 'liuhongwei/master'

Conflicts:
	lession.txt
Merge pull request #12 from pinguo-lihai/master

lihai
good!
Merge pull request #13 from pinguo-shenqiang/hotfix

修改误删代码
done
delete unused file:)
diff
diff 2