Commit 40ce6ca4 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'master' of github.com:twbs/bootstrap

parents 48836056 5f0c0c9e
3 merge requests!28721Hot test,!22103test,!25326Adjust examples
Showing with 1 addition and 1 deletion
+1 -1
......@@ -17,7 +17,7 @@ var DEST_FILE = 'test-infra/npm-shrinkwrap.canonical.json';
function cleanup(shrinkwrap) {
// Remove `resolved` property to avoid irrelevant changes
// See https://github.com/npm/npm/issues/3581
if ((typeof shrinkwrap) === 'string') {
if (typeof shrinkwrap === 'string') {
return shrinkwrap;
}
delete shrinkwrap.resolved;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment