assets/css/oof.css

@@ -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;

assets/js/site.js

@@ -51,8 +51,6 @@ jQuery(function($) {
         topFunction();
       });
 
-<<<<<<< HEAD:assets/js/site.js
-=======
       $(".closewin").click(function() {
         $("#playerwindow").css({
           'left': $("#playerwindow").data('originalLeft'),
@@ -69,7 +67,6 @@ jQuery(function($) {
           clearcache();
         });
 
->>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js
       var audio = document.getElementById('player');
       console.log(audio.src);
 
@@ -89,10 +86,8 @@ jQuery(function($) {
       },false);
   });
 
-<<<<<<< HEAD:assets/js/site.js
   // player things
 
-=======
   function checkepcache(){
     if (Cookies.get("lastep-src")){
       console.log("yahh");
@@ -134,7 +129,6 @@ jQuery(function($) {
       document.getElementById("lienep").href= linkdec;
   }
 
->>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js
   function play(src, title, date, body) {
       var audio = document.getElementById('player');
       console.log(src);
@@ -145,13 +139,11 @@ jQuery(function($) {
       document.getElementById("lienep").innerHTML= title;
       document.getElementById("sbody").innerHTML= body + "....";
       document.getElementById("lienep").href= linkdec;
-<<<<<<< HEAD:assets/js/site.js
       document.getElementById("player").pause();
       document.getElementById("player").setAttribute('src', linkdec);
       document.getElementById("player").load();
       document.getElementById("player").play();
       Cookies.set("lastep-title", title, { expires: 365 })
-=======
       audio.pause();
       audio.setAttribute('src', linkdec);
       if (title == Cookies.get("lastep_b4close-title")){
@@ -160,7 +152,6 @@ jQuery(function($) {
       audio.load();
       audio.play();
       Cookies.set("lastep-title", title, { expires: 365 });
->>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js
       Cookies.set("lastep-src", audio.src, { expires: 365 });
       Cookies.set("lastep-body", body, { expires: 365 })
       }