resolving bower conflicts for angular

daniel-cottone · Feb 28, 2016 · 7d6692a · 7d6692a
1 parent a3c8d3f
commit 7d6692a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "weather-forecast",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "^1.3.0",
+    "angular": "^1.5.0",
     "bootstrap": "^3.2.0",
     "angular-resource": "^1.3.0",
     "angular-ui-router": "~0.2.15",
@@ -12,6 +12,9 @@
     "lato": "~0.3.0",
     "weather-icons": "~2.0.10"
   },
+  "resolutions": {
+    "angular": "~1.5.0"
+  },
   "overrides": {
     "bootstrap": {
       "main": [