fix cherrypick error

2022-08-22 02:39:54 -04:00
parent c66bee62aa
commit efa6311c6e
2 changed files with 0 additions and 12 deletions
@@ -60,8 +60,6 @@ body {
    font-style: normal;
 }

-<<<<<<< HEAD:assets/css/oof.css
-=======
 #audioplayerdivstop {
  margin-bottom: 160px;
 }
@@ -70,7 +68,6 @@ body {
  margin-bottom: 2px;
 }

->>>>>>> ee5d4c2 (player can save time after win close):public/assets/css/oof.css
 #ws:link {
  text-decoration: none;
  color: inherit;