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

View File

@ -11491,5 +11491,5 @@
} }
}, },
"name": "angular", "name": "angular",
"version": "2.0.0-alpha.37" "version": "2.0.0-alpha.38"
} }

541
npm-shrinkwrap.json generated

File diff suppressed because it is too large Load Diff