Merge remote-tracking branch 'origin/develop-marcos_assuncao' into develop-gabriel-henrique

Desafio loja virtual
2026-05-21 21:32:39 -03:00 · 2026-05-21 21:31:50 -03:00
2 changed files with 1 additions and 5 deletions
--- a/exemplos/MarcosAssuncao/for.php
+++ b/exemplos/MarcosAssuncao/for.php
@@ -2,9 +2,5 @@
 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 - Gabriel Henrique	f844ec08e1	Merge remote-tracking branch 'origin/develop-marcos_assuncao' into develop-gabriel-henrique	2026-05-21 21:32:39 -03:00
2024 - Gabriel Henrique	1abee2abdf	Desafio loja virtual	2026-05-21 21:31:50 -03:00