masterOverrides needs resolutions to fix vaadin elements conflicts

diff --git a/bower.json b/bower.json
index 5bead9c133aba071eba89d4e5b399697c60df445..bb6b27480550c46fa67423d3de64036ebc1103db 100644 (file)
--- 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": {