develop2 #1

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

QingYanL wants to merge 4 commits into master from develop

Owner

QingYanL commented Jun 17, 2019

add develop

[email protected] and others added 4 commits

June 17, 2019 23:00


          develop2

235ae08


          develop

5c5780e


          solve conflict

f4da8f6


          Merge pull request #2 from QingYanL/master-sync-with-develop

556f5c1

Master sync with develop 解决冲突，合并到develop分支上

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

Labels

None yet