Merge branch 'develop' into develop-Lucas-Matheus

Merge branch 'develop-marcos_assuncao' into develop
Altera o texto de exemplo
2026-05-20 21:48:18 -03:00 · 2026-05-20 21:33:20 -03:00 · 2026-05-20 21:20:34 -03:00 · 2026-05-18 23:59:48 +00:00 · 2026-05-18 23:57:21 +00:00 · 2026-05-18 20:54:52 -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
Marcos Assuncao	7b91169b33	Merge branch 'develop-marcos_assuncao' into develop	2026-05-20 21:33:20 -03:00
2026 - Lucas Matheus	0f624cd0c9	Altera o texto de exemplo	2026-05-20 21:20:34 -03:00
Marcos Assunção	3a92010083	Merge pull request 'Corrige ortografia' (#35 ) from develop-marcos_assuncao into develop Reviewed-on: #35	2026-05-18 23:59:48 +00:00
Marcos Assunção	2f2eb352bc	Merge pull request 'Testa Desploy em develop e main' (#33 ) from develop-marcos_assuncao into develop Reviewed-on: #33	2026-05-18 23:57:21 +00:00
Marcos Assunção	5f3cb7e176	Merge branch 'develop-marcos_assuncao' into develop	2026-05-18 20:54:52 -03:00
Marcos Assunção	304cfc8663	Adiciona tag do Google Analytics	2026-05-15 18:15:46 +00:00
Marcos Assunção	31865ce5d9	Testa evento de push com commit	2026-05-15 17:28:34 +00:00
Marcos Assunção	05d8dc2235	Testa evento de push	2026-05-15 17:22:22 +00:00