1408080126 王晓蓉 作业二 上次index有冲突，没有再提交，补交一次#12
Open
galaxyyouyouyouzi wants to merge 2 commits intoguohaolys:masterfrom
Open
1408080126 王晓蓉 作业二 上次index有冲突，没有再提交，补交一次#12galaxyyouyouyouzi wants to merge 2 commits intoguohaolys:masterfrom
galaxyyouyouyouzi wants to merge 2 commits intoguohaolys:masterfrom
Conversation
老师上次看过作业，但是提交后有冲突，再交一次
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
1408080126 王晓蓉 作业二 上次有冲突，没有再提交，补交一次