Merge branch 'develop' into develop-gabriel-henrique

Altera o texto de exemplo
2026-05-20 21:52:37 -03:00 · 2026-05-20 21:21:32 -03:00
2 changed files with 3 additions and 4 deletions
--- a/exemplos/GabrielHenrique/teste.php
+++ b/exemplos/GabrielHenrique/teste.php
@@ -0,0 +1,3 @@
 <?php
 echo ""
 ?>
--- 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
2024 - Gabriel Henrique	de65e31aea	Merge branch 'develop' into develop-gabriel-henrique	2026-05-20 21:52:37 -03:00
2024 - Gabriel Henrique	1e42a35fc1	Altera o texto de exemplo	2026-05-20 21:21:32 -03:00