This repository was archived by the owner on Feb 20, 2019. It is now read-only.
feat(second): add second function#242
Merged
kentcdodds merged 3 commits intoeggheadio-github:masterfrom Feb 12, 2019
Merged
Conversation
kentcdodds
suggested changes
Feb 12, 2019
Member
kentcdodds
left a comment
kentcdodds
left a comment
There was a problem hiding this comment.
Looks great! But there does appear to be some conflict in the src/index.js. Could you please try to rebase your changes onto master and resolve those?
Contributor
Author
|
I have resolved the issues that you mentioned. But, not sure about the conflicting one. I rebase onto master. Not sure whether it solves the issue or not. |
Member
|
There are still conflicts, but I can fix those for you no problem :) I'm not sure what happened. |
Codecov Report
@@ Coverage Diff @@
## master #242 +/- ##
=====================================
Coverage 100% 100%
=====================================
Files 93 94 +1
Lines 453 454 +1
=====================================
+ Hits 453 454 +1
Continue to review full report at Codecov.
|
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Please let me merge.