32 高承星 第三课作业 #238
Merged
32 高承星 第三课作业 #238
Conversation
This file contains 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
Pull First Assignment
get第一课内容
90-zhangliang第一节课作业
第一次提交作业 错误的地方请老师 指教
Get 第二课内容
Merge pull request #1 from linjie-1/master
Update yours.sol
lesson 2
lesson 3
* delete hw2
GET 第三课作业
Revert 误合并到master上的作业代码
into linjie-1 Conflicts: Lesson2/assignment/yours.sol lesson1/assignment/yours.sol # # It looks like you may be committing a merge. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch linjie-1 # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: Lesson3/README.md # new file: Lesson4/README.md # new file: Lesson4/assignment/README.md # new file: Lesson4/assignment/yours.sol # new file: Lesson4/orgin/README.md # new file: Lesson4/orgin/payroll.sol # modified: lesson1/orgin/payroll.sol #
…y 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.
stevenlcf
approved these changes
Jan 19, 2018
stevenlcf
approved these changes
Jan 19, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@stevenlcf
加分题答案写在了readme里
截图见screenshots.zip文件