3 Commits

Author SHA1 Message Date
f053399e34 Merge branch 'develop' into develop-d4v1 2026-05-20 21:55:25 -03:00
74c20e6618 Altera o texto de exemplo 2026-05-20 21:23:22 -03:00
22d200ffba Altera texto de exemplo 2026-05-20 21:21:33 -03:00

View File

@@ -1,6 +1,3 @@
<<<<<<< HEAD
<?php echo "lucasmatheus";?>
=======
<?php echo "Marcos Assunção";?> <?php echo "Marcos Assunção";?>
<br> 1 <br> 1
<br> 2 <br> 2
@@ -15,4 +12,3 @@
<br> 11 <br> 11
<br> 12 <br> 12
<br> 13 <br> 13
>>>>>>> develop