Skip to content

BOOM shakalaka wooooooooo!!!!!! #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MesterKeil wants to merge 2 commits into
base: master
Choose a base branch
from
Open

BOOM shakalaka wooooooooo!!!!!! #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098182d
Update readme.md
ZHANGSHAOKANG Oct 10, 2015
3d7213c
Merge branch 'master' of https://github.com/MesterKeil/sign-up
MesterKeil Oct 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@
##个人信息包括：
=========
```js
<<<<<<< HEAD
*姓名 夏民玮
*学院+专业 计算机与软件学院+软件工程（2）
*联系方式（微信或者QQ） TEL:15261821113 QQ:781339476
*个人爱好 爱游戏更爱了解如何制作游戏 音乐
=======
*姓名
*学院+专业
*联系方式（微信或者QQ）
*个人爱好
>>>>>>> 1d5000e041091ffe32c55434f47946e0fa7f3f5a
```
##git教程链接
*http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000
*http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000