From 631a9f92eaa1281a96942bca960cde481d1817bd Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 5 May 2017 14:19:37 +0200
Subject: [PATCH] fix merge bug + add ignore list

---
 src/Umbraco.Web.UI.Client/bower.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 15311b645f..b539217338 100644
--- 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": [