From 41f7e4fd5681d59934235878a13cb3f347711580 Mon Sep 17 00:00:00 2001
From: Gerome Matilla <gerome.matilla07@gmail.com>
Date: Thu, 21 May 2020 09:30:36 +0800
Subject: [PATCH] fix merge headers

---
 userChrome.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/userChrome.css b/userChrome.css
index c7ba516..9dbc863 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -17,12 +17,7 @@
 
 	--bf-tab-height: 32px;
 	--bf-tab-border-radius: 6px;
-
-<<<<<<< HEAD
 	--bf-tab-soundplaying-bg: #985EFFCC;
-=======
-	--bf-tab-soundplaying-bg: var(--bf-hover-bg);
->>>>>>> 3692f13a9afa6a41d76d4e319a50e4d863cb8cc8
 
 	--bf-navbar-padding: 4px;