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

2026-05-21 21:30:00 -03:00
parent 8e1b359b9a cd82694f38
commit 427a1180a1
3 changed files with 33 additions and 0 deletions
--- a/exemplos/MarcosAssuncao/for.php
+++ b/exemplos/MarcosAssuncao/for.php
@@ -2,4 +2,9 @@
 for ($i = 10; $i >= 1; $i--)    {
    echo "<h3> $i</h3>";
 }
+<<<<<<< HEAD
 ?>
+=======
+echo $i;
+?>
+>>>>>>> origin/develop-marcos_assuncao