fix flow issue caused by conflicting merges#4144
Merged
boujeepossum merged 1 commit intojestjs:masterfrom Jul 27, 2017
Merged
Conversation
cpojer
approved these changes
Jul 27, 2017
Codecov Report
@@ Coverage Diff @@
## master #4144 +/- ##
=========================================
Coverage ? 60.55%
=========================================
Files ? 196
Lines ? 6777
Branches ? 6
=========================================
Hits ? 4104
Misses ? 2670
Partials ? 3Continue to review full report at Codecov.
|
tushardhole
pushed a commit
to tushardhole/jest
that referenced
this pull request
Aug 21, 2017
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
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.
4 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.
both PRs had green builds, but ended up conflicting with each other in master