Merge branch 'develop' into develop-Lucas-Matheus

Merge branch 'develop-marcos_assuncao' into develop
Cria lista para merge
2026-05-20 21:48:18 -03:00 · 2026-05-20 21:33:20 -03:00 · 2026-05-20 21:32:21 -03:00 · 2026-05-20 21:21:12 -03:00 · 2026-05-20 21:20:34 -03:00
1 changed files with 18 additions and 1 deletions
--- a/index.php
+++ b/index.php
@@ -1 +1,18 @@
-<?php echo "Teste de deploy nas branches develop e main";
+<<<<<<< HEAD
 <?php echo "lucasmatheus";?>
 =======
 <?php echo "Marcos Assunção";?>
 <br> 1 
 <br> 2
 <br> 3
 <br> 4
 <br> 5
 <br> 6
 <br> 7
 <br> 8
 <br> 9
 <br> 10
 <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
Marcos Assuncao	7b91169b33	Merge branch 'develop-marcos_assuncao' into develop	2026-05-20 21:33:20 -03:00
Marcos Assuncao	52d7108545	Cria lista para merge	2026-05-20 21:32:21 -03:00
Marcos Assunção	e33f1a6df9	Altera o texto de exemplo	2026-05-20 21:21:12 -03:00
2026 - Lucas Matheus	0f624cd0c9	Altera o texto de exemplo	2026-05-20 21:20:34 -03:00