add 21:21
commit
as
Merge remote-tracking branch 'lhw/master'
Merge remote-tracking branch 'hehl/master'

Conflicts:
	lession.txt
Merge pull request #4 from pinguo-liaofeng/master

我知道不能合并
add lines
Merge pull request #31 from pinguo-hehailin/master

asdasdsa 21:31
Merge remote-tracking branch 'lhw/master'
Update lession.txt
changed one line 26'
Merge pull request #2 from pinguo-liuhongwei/master

add new line
s
Merge remote-tracking branch 'hehl/master'

Conflicts:
	lession.txt
Merge pull request #5 from pinguo-liaofeng/master

稍等
Merge pull request #32 from pinguo-hehailin/master

21:48 hehl
no confict
Merge branch 'master' of https://github.com/pinguo-tanglei/lession1