Skip to content

Commit

Permalink
fix merge conflict (jestjs#4144)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronabramov committed Jul 27, 2017
1 parent 7725f05 commit 2007b75
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions test_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const DEFAULT_GLOBAL_CONFIG: GlobalConfig = {
coverageReporters: [],
coverageThreshold: {global: {}},
expand: false,
findRelatedTests: false,
forceExit: false,
json: false,
lastCommit: false,
Expand Down

0 comments on commit 2007b75

Please sign in to comment.