Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
40ce6ca4
Commit
40ce6ca4
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch 'master' of github.com:twbs/bootstrap
parents
48836056
5f0c0c9e
3 merge requests
!28721
Hot test
,
!22103
test
,
!25326
Adjust examples
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
grunt/shrinkwrap.js
+1
-1
grunt/shrinkwrap.js
with
1 addition
and
1 deletion
+1
-1
grunt/shrinkwrap.js
+
1
-
1
View file @
40ce6ca4
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets