Update 花名册.txt
fix-conflicts
Merge branch 'chenyong0408-master'
Funpee同学加了一行自己的联系方式

你说使用空格还是 tab 缩进？
Update 花名册.txt
Merge pull request #5 from Snowpee/master

Funpee同学加了一行自己的联系方式
add-Rayflavor
Update 花名册.txt
Update 花名册.txt
Update 花名册.txt
Merge pull request #7 from taoguoen/master

Update 花名册.txt
Merge branch 'ziyu123-master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Add GaryTo
add GrayTo
Merge branch 'master' of https://github.com/Tower-KevinLi/Designers-Learn-Git

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add jon
add jon
Merge pull request #11 from Tower-KevinLi/master

加一行