From 585da38a168e60d9a78092f081b68024455c66f3 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Mon, 11 Jul 2016 13:46:46 -0700
Subject: [PATCH] Fixed some merge issues

---
 .../mode-selector/mode-selector.html          | 17 -----------
 .../res/templates/time-conductor.html         | 28 -------------------
 2 files changed, 45 deletions(-)

diff --git a/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html b/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
index cae3f457537..0ec12c4f0a6 100644
--- a/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
+++ b/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
@@ -19,23 +19,6 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<!--<style>
-    .super-menu.mode-selector-menu {
-        width: 400px;
-    }
-    .super-menu.mode-selector-menu {
-        height: 200px;
-        bottom: 0px;
-    }
-    .super-menu.mode-selector-menu .menu-item-description .desc-area.icon {
-        height: 20%;
-        font-size: 3em;
-        line-height: normal;
-    }
-    .super-menu .mode-selector-menu .menu-item-description .desc-area.description {
-        height: 60%;
-    }
-</style>-->
 <span ng-controller="ClickAwayController as modeController">
     <div class="s-menu-btn"
          ng-click="modeController.toggle()">
diff --git a/platform/features/conductor-v2/res/templates/time-conductor.html b/platform/features/conductor-v2/res/templates/time-conductor.html
index aad1889fb32..a91fe47473a 100644
--- a/platform/features/conductor-v2/res/templates/time-conductor.html
+++ b/platform/features/conductor-v2/res/templates/time-conductor.html
@@ -1,31 +1,3 @@
-<style>
-    .time-system .menu{
-        bottom: 10px;
-    }
-    .l-data-availability {
-        width: 100%;
-        height: 20px;
-        background-color: #3b3b3b
-    }
-
-    .l-time-range-inputs-elem {
-        width: 100%;
-    }
-
-    .l-time-range-inputs-elem.l-flex-row {
-        justify-content: space-between;
-    }
-    .l-axis-holder {
-        height: 30px;
-        width: 100%;
-    }
-
-    .l-axis-holder svg, .l-axis-holder svg path,
-    .l-axis-holder svg line  {
-        stroke: #A0A0A0;
-    }
-
-</style>
 <!-- Parent holder for time conductor. follow-mode | fixed-mode -->
 <div ng-controller="TimeConductorController as tcController"
      class="l-time-conductor l-flex-col {{modeModel.selected}}-mode">