From 9b47d924b33f526da28c36a8536722e13a623f1e Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Tue, 1 Sep 2020 09:37:59 -0700
Subject: [PATCH] fix merge conflict

---
 scripts/system/html/css/tabs.css | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/scripts/system/html/css/tabs.css b/scripts/system/html/css/tabs.css
index 9806651953..6abd910300 100644
--- a/scripts/system/html/css/tabs.css
+++ b/scripts/system/html/css/tabs.css
@@ -2,11 +2,7 @@
 //  tabs.css
 //
 //  Created by Alezia Kurdis on 27 Feb 2020
-<<<<<<< HEAD
-//  Copyright 2020 Project Athena contributors.
-=======
 //  Copyright 2020 Vircadia contributors.
->>>>>>> upstream/master
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -35,15 +31,9 @@ div.tabsContainer {
     background-color: #575757;
 }
 
-<<<<<<< HEAD
-.tabsContainer  button.active {
-    background-color: #2E2E2E;
-}    
-=======
 .tabsContainer button.active {
     background-color: #2E2E2E;
 }
->>>>>>> upstream/master
 
 div.labelTabHeader {
     font-size: 20px;
@@ -59,11 +49,7 @@ div.tab-section-header {
 
 table.tabsTableFrame {
     width: 100%;
-<<<<<<< HEAD
-    min-height: 352px; 
-=======
     min-height: 352px;
->>>>>>> upstream/master
     display: block;
 }
 
@@ -82,11 +68,7 @@ td.tabsFrame {
 td.tabsPropertiesFrame {
     width: 100%;
     vertical-align: top;
-<<<<<<< HEAD
-    border:0px;
-=======
     border: 0px;
->>>>>>> upstream/master
 }
 
 div.tabsPropertiesPage {