Merge pull request #979 from PolymerElements/polymer-rc

Update Polymer to RC1
Polymer · Mar 7, 2017 · 333212c · 333212c
2 parents 88c5ba5 + 1b488e7
commit 333212c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -15,8 +15,11 @@
     "iron-pages": "PolymerElements/iron-pages#2.0-preview",
     "iron-selector": "PolymerElements/iron-selector#2.0-preview",
     "paper-icon-button": "PolymerElements/paper-icon-button#2.0-preview",
-    "polymer": "Polymer/polymer#2.0-preview",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.1"
+    "polymer": "Polymer/polymer#^2.0.0-rc.1",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.4"
+  },
+  "resolutions": {
+    "polymer": "^2.0.0-rc.1"
   },
   "devDependencies": {
     "web-component-tester": "6.0.0-prerelease.5"