From: Manolo Carrasco <manolo@vaadin.com>
Date: Wed, 26 Jul 2017 17:50:50 +0000 (+0200)
Subject: masterOverrides needs resolutions to fix vaadin elements conflicts
X-Git-Tag: v2.0.0-alpha1~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=47fdcb5ab7e825f66229b12a109df5e42a963614;p=vaadin-core.git

masterOverrides needs resolutions to fix vaadin elements conflicts
---

diff --git a/bower.json b/bower.json
index 5bead9c..bb6b274 100644
--- a/bower.json
+++ b/bower.json
@@ -64,6 +64,15 @@
       "vaadin-text-field": "vaadin/vaadin-text-field#master",
       "vaadin-themes": "vaadin/vaadin-themes#master",
       "vaadin-upload": "vaadin/vaadin-upload#master"
+    },
+    "resolutions": {
+      "iron-flex-layout": "^2.0.0",
+      "iron-icon": "2.0.0",
+      "iron-iconset-svg": "^2.0.0",
+      "iron-meta": "1 - 2",
+      "iron-form": "^2.0.0",
+      "vaadin-button": "master",
+      "vaadin-text-field": "master"
     }
   },
   "resolutions": {