Skip to content
This repository has been archived by the owner on Feb 20, 2019. It is now read-only.

feat(second): add second function #242

Merged
merged 3 commits into from
Feb 12, 2019

Conversation

yeashinr
Copy link
Contributor

Please let me merge.

@yeashinr yeashinr closed this Feb 12, 2019
@yeashinr yeashinr reopened this Feb 12, 2019
Copy link
Member

@kentcdodds kentcdodds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

@yeashinr
Copy link
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.

@kentcdodds
Copy link
Member

There are still conflicts, but I can fix those for you no problem :) I'm not sure what happened.

Copy link
Member

@kentcdodds kentcdodds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@kentcdodds kentcdodds merged commit d00b122 into eggheadio-github:master Feb 12, 2019
@codecov-io
Copy link

codecov-io commented Feb 12, 2019

Codecov Report

Merging #242 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff          @@
##           master   #242   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files          93     94    +1     
  Lines         453    454    +1     
=====================================
+ Hits          453    454    +1
Impacted Files Coverage Δ
src/second.js 100% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 38b6e73...8f2913f. Read the comment docs.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants