Merge pull request #84 from vogdb/issue-84

Resolve bower conflicts
cargomedia · Jun 12, 2015 · 1ae8f53 · 1ae8f53
2 parents 19b8a9a + 60ca033
commit 1ae8f53
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/bower.json b/bower.json
@@ -12,5 +12,8 @@
         "bootstrap": "~3.3",
         "requirejs": ">=2.1.10",
         "jquery-timeago": "1.4.0"
+    },
+    "resolutions": {
+      "jquery": "~2.0.0"
     }
 }