build(npm): resolve shrinkwrap conflicts after rebase
This commit is contained in:
parent
5ff1eb75d0
commit
4b0013c7e7
@ -11491,5 +11491,5 @@
|
||||
}
|
||||
},
|
||||
"name": "angular",
|
||||
"version": "2.0.0-alpha.37"
|
||||
"version": "2.0.0-alpha.38"
|
||||
}
|
||||
|
541
npm-shrinkwrap.json
generated
541
npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user