Merge branch 'develop' into develop-anna-lyz

altera o texto de exemplo
2026-05-20 21:54:19 -03:00 · 2026-05-20 21:24:44 -03:00
1 changed files with 0 additions and 4 deletions
--- a/index.php
+++ b/index.php
@@ -1,6 +1,3 @@
 <<<<<<< HEAD
 <?php echo "lucasmatheus";?>
 =======
 <?php echo "Marcos Assunção";?>
 <br> 1 
 <br> 2
@@ -15,4 +12,3 @@
 <br> 11
 <br> 12
 <br> 13
 >>>>>>> develop
Author	SHA1	Message	Date
2026-Anna Lyz	a6d4e8f6f6	Merge branch 'develop' into develop-anna-lyz	2026-05-20 21:54:19 -03:00
2026-AnnaLyz da Silva Abrantes	68d9b7b21b	altera o texto de exemplo	2026-05-20 21:24:44 -03:00