work please #3

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

Jump to bottom

Open

tangyefei wants to merge 3 commits into LauraXia123:master from tangyefei:master

Collaborator

tangyefei commented Aug 12, 2015

test merge

tangyefei added 2 commits

August 12, 2015 15:13


          try to cause conflict

4a50ae4

LauraXia123 self-assigned this


          test

6ab35cc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet