fix merge headers

2020-05-21 09:30:36 +08:00 · 2020-05-21 09:30:36 +08:00 · 41f7e4fd56
commit 41f7e4fd56
parent c424dd1fcc
1 changed files with 0 additions and 5 deletions
--- 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;