1 Commits

Author SHA1 Message Date
c23fcb54c2 altera texto de exemplo 2026-05-20 21:21:46 -03:00

View File

@@ -1,18 +1 @@
<<<<<<< HEAD <?php echo "gabriel";?>
<?php echo "lucasmatheus";?>
=======
<?php echo "Marcos Assunção";?>
<br> 1
<br> 2
<br> 3
<br> 4
<br> 5
<br> 6
<br> 7
<br> 8
<br> 9
<br> 10
<br> 11
<br> 12
<br> 13
>>>>>>> develop