Añadiendo la rama desarrollo

This commit is contained in:
Darkko Stephano Zet Samayoa 2024-09-03 10:46:23 -06:00
parent c0f7e7230f
commit ab17fb270c
2 changed files with 9 additions and 1 deletions

1
TailwindCSS Submodule

@ -0,0 +1 @@
Subproject commit 0ee824128da8854860446ed1885390b725364a82

View File

@ -7,12 +7,19 @@
</head>
<body>
<div class="text">
<p>Hola Mundo</p>
<p>Hola Mundo</p>
</div>
<div class="lorem">
<!--RamaConflicto-->
<p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Este cambio esta hecho en la ramaConflicto, amet at dolorem hic, laborum vel quibusdam non. Doloremque beatae mollitia esse officia quam, quod blanditiis ut.</p>
</div>
<!--Rama Desarrollo-->
<div>
<h1>Rama Desarrollo</h1>
<p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eligendi debitis corrupti quaerat quasi.
</p>
</div>
</body>
</html>