fix merge bug + add ignore list

2017-05-05 14:19:37 +02:00
parent 229a15be4f
commit 631a9f92ea
1 changed files with 8 additions and 2 deletions
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -30,13 +30,19 @@
    "angular-local-storage": "~0.2.3",
    "moment": "~2.10.3",
    "ace-builds": "^1.2.3",
-    "tinymce": "tinymce-dist#^4.5.2"
+    "font-awesome": "~4.2"
  },

  "install": {
-    
+
    "path": "lib-bower",

+    "ignore": [
+      "font-awesome",
+      "angular",
+      "bootstrap"
+    ],
+    
    "sources": {
      "moment": "bower_components/moment/min/moment-with-locales.js",
      "underscore": [