Merge pull request #10 from JohnKun136NVCP/dev1.1.0

[FIX][DEV1.1.0][OWNER]
JohnKun136NVCP · Dec 3, 2023 · d566452 · d566452
2 parents a01bd6d + c6bba78
commit d566452
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/404.html b/404.html
@@ -20,14 +20,9 @@ <h1>404 - Not Found</h1>
         </div>
         <div class="music-player">
             <p>YOU'RE LISTENING '【Hatsune Miku】Dumb【Vocaloid Original Song】 by Shiiyato'</p>
-<<<<<<< HEAD
-            <audio  controls autoplay>
-=======
             <audio autoplay>
->>>>>>> 498ae1781ef7f975fda5c2f5118a81b2b82cf287
                 <source id="myAudio" src="music/musicVocaloid.mp3"> 
             </audio>
-
         </div>
         <a href="/">Go Home</a>
     </div>

diff --git a/es/blogsnum/blogses.html b/es/blogsnum/blogses.html
@@ -76,7 +76,7 @@ <h2><a href="/es/blogs/art/art02.html">🌐 ¡Espejito, Espejito en la Red! 🕵
                 <div class="tag tecnology">Tecnología </div>
                 <div class="tag date">02/12/23</div>
                 <div class="tag numart">2</div>
-                <div class="tag"> <button class="button" onclick="location.href='e/blogs/art/art02.html'">Ir al blog</button></div>
+                <div class="tag"> <button class="button" onclick="location.href='/es/blogs/art/art02.html'">Ir al blog</button></div>
             </li>
 
             <!---