Merge branch 'develop' into develop-davi-lopes

altera o texto de exemplo
altera texto de exemplo
2026-05-20 21:54:30 -03:00 · 2026-05-20 21:49:25 -03:00 · 2026-05-20 21:37:23 -03:00 · 2026-05-20 21:24:57 -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-Davi Lopes Vieira	e126e4e94e	Merge branch 'develop' into develop-davi-lopes	2026-05-20 21:54:30 -03:00
2026-Davi Lopes Vieira	5f8e43716e	altera o texto de exemplo	2026-05-20 21:49:25 -03:00
2026-Davi Lopes Vieira	844a03daa2	altera texto de exemplo	2026-05-20 21:37:23 -03:00
2026-Davi Lopes Vieira	19ff4afb5a	confugura o texto de exemplo	2026-05-20 21:24:57 -03:00