fix commit error and why are they spider in my hom

2022-08-22 01:50:31 -04:00
parent 4727055eb3
commit 3c306eb402
2 changed files with 0 additions and 4 deletions
@@ -82,13 +82,10 @@ jQuery(function($) {
      }
      
      audio.addEventListener('timeupdate',function(){
-<<<<<<< HEAD
        var currentTime = audio.currentTime;  
        Cookies.set("lastep-time", currentTime);
-=======
          var currentTime = audio.currentTime;
          Cookies.set("lastep-time", currentTime, { expires: 365 });
->>>>>>> 9f36b512a893a4955dde67afea5f1b675cf31c05
      },false);
  });