Merge branch 'develop' into develop-Lucas-Matheus

Altera o texto de exemplo
2026-05-20 21:48:18 -03:00 · 2026-05-20 21:20:34 -03:00
1 changed files with 4 additions and 0 deletions
--- a/index.php
+++ b/index.php
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+<?php echo "lucasmatheus";?>
+=======
 <?php echo "Marcos Assunção";?>
 <br> 1 
 <br> 2
@@ -12,3 +15,4 @@
 <br> 11
 <br> 12
 <br> 13
+>>>>>>> develop
Author	SHA1	Message	Date
2026 - Lucas Matheus	15b6cfdb11	Merge branch 'develop' into develop-Lucas-Matheus	2026-05-20 21:48:18 -03:00
2026 - Lucas Matheus	0f624cd0c9	Altera o texto de exemplo	2026-05-20 21:20:34 -03:00