build(npm): resolve shrinkwrap conflicts after rebase

2015-09-25 21:42:41 -07:00 · 2015-09-25 21:42:41 -07:00 · 4b0013c7e7
parent 5ff1eb75d0
commit 4b0013c7e7
2 changed files with 275 additions and 268 deletions
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@ -11491,5 +11491,5 @@
    }
  },
  "name": "angular",
-  "version": "2.0.0-alpha.37"
+  "version": "2.0.0-alpha.38"
 }
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json