Arreglando cagadas del mono episodio 2, ahora es personal

MONZONPUNTOEXE · web-flow · commit 157e45596f92 · 2025-11-24T21:54:40.000-03:00
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -1,13 +1,7 @@
 ---
-<<<<<<< HEAD
-import '../styles/tailwind.css';
-import Nav from '../components/nav/Nav.astro';
-import Footer from '../components/footer/Footer.astro';
-=======
 import Nav from "../components/nav/Nav.astro";
 import Footer from "../components/footer/Footer.astro";
 import "../styles/tailwind.css";
->>>>>>> 8560f4a (refactoring - cambiando diseño de la pagina)
 ---
 
 <!doctype html>
