Merge branch 'develop' into develop-welbert-lima

altera o texto de exemplo
2026-05-20 21:54:26 -03:00 · 2026-05-20 21:21:24 -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-welbertlima	f4785316c2	Merge branch 'develop' into develop-welbert-lima	2026-05-20 21:54:26 -03:00
2026-welbertlima	816c16614a	altera o texto de exemplo	2026-05-20 21:21:24 -03:00