Merge pull request 'develop' (#34 ) from develop into main

Reviewed-on: #34
Merge pull request 'develop' (#32 ) from develop into main
2026-05-18 23:57:53 +00:00 · 2026-05-18 23:56:10 +00:00 · 2026-05-15 15:40:58 -03:00 · 2026-05-15 17:32:02 +00:00 · 2026-05-15 17:22:46 +00:00 · 2026-05-12 23:19:37 +00:00
1 changed files with 1 additions and 18 deletions
--- a/index.php
+++ b/index.php
@@ -1,18 +1 @@
-<<<<<<< HEAD
+<?php echo "Teste de Desploy develop e main2";
 <?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
Marcos Assunção	09445d9da7	Merge pull request 'develop' (#34 ) from develop into main Reviewed-on: #34	2026-05-18 23:57:53 +00:00
Marcos Assunção	e9de765b56	Merge pull request 'develop' (#32 ) from develop into main Reviewed-on: #32	2026-05-18 23:56:10 +00:00
mvassuncao1	041d846a6b	Merge branch 'develop'	2026-05-15 15:40:58 -03:00
Marcos Assunção	114ed1240b	Testa evento de push com commit	2026-05-15 17:32:02 +00:00
Marcos Assunção	b3d9f6e3ac	Testa evento de push	2026-05-15 17:22:46 +00:00
Marcos Assunção	df13afc30d	Merge pull request 'develop' (#25 ) from develop into main Reviewed-on: #25	2026-05-12 23:19:37 +00:00
Marcos Assunção	e2e171a91d	Excluir .env	2026-05-12 23:18:29 +00:00