build(npm): resolve shrinkwrap conflicts after rebase

This commit is contained in:
Igor Minar
2015-09-25 21:42:41 -07:00
parent 5ff1eb75d0
commit 4b0013c7e7
2 changed files with 275 additions and 268 deletions
+1 -1
View File
@@ -11491,5 +11491,5 @@
}
},
"name": "angular",
"version": "2.0.0-alpha.37"
"version": "2.0.0-alpha.38"
}
+274 -267
View File
File diff suppressed because it is too large Load Diff