From 090ccd9c0d0535fee202b7f719620960a85f88d5 Mon Sep 17 00:00:00 2001
From: KRTirtho <krtirtho@gmail.com>
Date: Sun, 21 Mar 2021 22:40:37 -0700
Subject: [PATCH] Fixed TabItem color

---
 package.json                         | 3 ---
 src/components/PlayerProgressBar.tsx | 4 ----
 src/components/TabMenu.tsx           | 3 ---
 3 files changed, 10 deletions(-)

diff --git a/package.json b/package.json
index 50fa89ae..233a5f82 100644
--- a/package.json
+++ b/package.json
@@ -56,10 +56,7 @@
     "@types/webpack-env": "^1.15.3",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
-<<<<<<< HEAD
-=======
     "cross-env": "^7.0.3",
->>>>>>> 4aa80fbee543b23474e26fcb82f56a593ea61515
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^6.1.0",
     "native-addon-loader": "^2.0.1",
diff --git a/src/components/PlayerProgressBar.tsx b/src/components/PlayerProgressBar.tsx
index 14d048fd..23cc6aef 100644
--- a/src/components/PlayerProgressBar.tsx
+++ b/src/components/PlayerProgressBar.tsx
@@ -11,11 +11,7 @@ interface PlayerProgressBarProps {
 
 function PlayerProgressBar({ audioPlayer, totalDuration }: PlayerProgressBarProps) {
   const { currentTrack } = useContext(playerContext);
-<<<<<<< HEAD
   const [trackTime, setTrackTime] = useState<number>(0);
-=======
-  const [trackTime, setTrackTime] = useState(0);
->>>>>>> 4aa80fbee543b23474e26fcb82f56a593ea61515
   const trackSliderEvents = useEventHandler<QAbstractSliderSignals>(
     {
       sliderMoved: (value) => {
diff --git a/src/components/TabMenu.tsx b/src/components/TabMenu.tsx
index fce09cf9..c7544298 100644
--- a/src/components/TabMenu.tsx
+++ b/src/components/TabMenu.tsx
@@ -26,9 +26,6 @@ export const tabBarStylesheet = `
   #tabmenu-item:hover{
     color: green;
   }
-  #tabmenu-item:active{
-    color: #59ff88;
-  }
   #tabmenu-active-item{
     background-color: green;
     color: white;