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