Merge remote-tracking branch 'origin/develop-marcos_assuncao' into develop-bruno_matos

Merge remote-tracking branch 'origin/develop-gabriel-henrique' into develop-bruno_matos
estrutura for
2026-05-21 21:30:00 -03:00 · 2026-05-21 21:16:37 -03:00 · 2026-05-21 21:16:14 -03:00
2 changed files with 5 additions and 1 deletions
--- a/exemplos/MarcosAssuncao/for.php
+++ b/exemplos/MarcosAssuncao/for.php
@@ -2,5 +2,9 @@
 for ($i = 10; $i >= 1; $i--)    {
    echo "<h3> $i</h3>";
 }
+<<<<<<< HEAD
+?>
+=======
 echo $i;
 ?>
+>>>>>>> origin/develop-marcos_assuncao
--- a/exemplos/gabriel_henrique/desafio-loja-virtual.php
+++ b/exemplos/gabriel_henrique/desafio-loja-virtual.php
Author	SHA1	Message	Date
2024 - brunomatos	427a1180a1	Merge remote-tracking branch 'origin/develop-marcos_assuncao' into develop-bruno_matos	2026-05-21 21:30:00 -03:00
2024 - brunomatos	8e1b359b9a	Merge remote-tracking branch 'origin/develop-gabriel-henrique' into develop-bruno_matos	2026-05-21 21:16:37 -03:00
2024 - brunomatos	f339472e01	estrutura for	2026-05-21 21:16:14 -03:00