Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/xavierchow/nock into xavier…
Browse files Browse the repository at this point in the history
…chow-master
  • Loading branch information
pgte committed Jan 5, 2016
2 parents b0cff56 + eddb2b9 commit 19c11bd
Show file tree
Hide file tree
Showing 3 changed files with 10,499 additions and 4,925 deletions.
4 changes: 2 additions & 2 deletions lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var restoreOverriddenRequests = function() {
override.module.request = override.request;
debug('- restored request for', proto);
}
});
}).value();
requestOverride = [];
};

Expand Down Expand Up @@ -238,7 +238,7 @@ var deleteHeadersField = function(headers, fieldNameToDelete) {
// We don't stop here but continue in order to remove *all* matching field names
// (even though if seen regorously there shouldn't be any)
}
});
}).value();

};

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
"debug": "^2.2.0",
"deep-equal": "^1.0.0",
"json-stringify-safe": "^5.0.1",
"lodash": "2.4.1",
"lodash": "^3.10.1",
"mkdirp": "^0.5.0",
"propagate": "0.3.x"
},
Expand Down
Loading

0 comments on commit 19c11bd

Please sign in to comment.