dszets/TailwindCSS
1
0
Fork 0
forked from belopezp/TailwindCSS
Code Pull Requests Activity

Resolvimos el conflicto

Browse Source
This commit is contained in:
Darkko Stephano Zet Samayoa 2024-09-02 10:52:22 -06:00
commit 7fd7fb9b7b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -10,8 +10,8 @@
<p>Hola Mundo</p>
</div>
<div class="lorem">
<!--Rama Main-->
<p>Lorem ipsum dolor, Este cambio esta hecho en la rama Main. Aperiam culpa consequuntur numquam architecto, amet at dolorem hic, laborum vel quibusdam non. Doloremque beatae mollitia esse officia quam, quod blanditiis ut.</p>
<!--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>
</body>
</html>