From fc2b3d7fc7f659077504510e30dd0cdd7d67fa6d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Mar 2015 14:23:55 +1100
Subject: [PATCH] fixes merge issues

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

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index ce312d669a..ed2b0d7332 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -19,11 +19,11 @@
         "typeahead.js": "~0.10.5",
         "underscore": "~1.7.0",
         "rgrove-lazyload": "*",
-        "bootstrap-social": "~4.8.0"
+        "bootstrap-social": "~4.8.0",
         "jquery": "2.0.3",
         "jquery-file-upload": "~9.4.0",
         "jquery-ui": "1.10.3",
-        "angular-dynamic-locale":  "~0.1.27"
+        "angular-dynamic-locale": "~0.1.27"
     },
     "exportsOverride": {
         "rgrove-lazyload": {
@@ -35,18 +35,21 @@
         "underscore": {
             "": "underscore-min.{js,map}"
         },
+        "angular-dynamic-locale": {
+            "": "tmhDynamicLocale.min.{js,js.map}"
+        },
         "bootstrap-social": {
             "": "bootstrap-social.css"
         },
         "font-awesome": {
             "css": "css/font-awesome.min.css",
-            "fonts" :  "fonts/*"
+            "fonts": "fonts/*"
         },
         "bootstrap": {
             "ignore": "*.ignore"
         },
         "jquery": {
-            "": "jquery.min.{js,map}"  
+            "": "jquery.min.{js,map}"
         },
         "jquery-file-upload": {
             "": "**/jquery.{fileupload,fileupload-process,fileupload-angular,fileupload-image}.js"
@@ -61,7 +64,7 @@
         "blueimp-tmpl": {
             "ignore": "*.ignore"
         },
-        
+
         "blueimp-canvas-to-blob": {
             "ignore": "*.ignore"
         }