[Themes] Resolve conflicts

Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:09:42 -07:00
parent aba0969312 54334a8906
commit dbe1875e70
95 changed files with 11085 additions and 6512 deletions
--- a/platform/commonUI/browse/bundle.json
+++ b/platform/commonUI/browse/bundle.json
@@ -58,12 +58,6 @@
                "templateUrl": "templates/create/locator.html"
            }
        ],
-        "templates": [
-            {
-                "key": "topbar-browse",
-                "templateUrl": "templates/topbar-browse.html"
-            }
-        ],
        "representations": [
            {
                "key": "browse-object",