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

Reviewed-on: #36
Merge pull request 'Corrige ortografia' (#35 ) from develop-marcos_assuncao into develop
2026-05-19 00:00:02 +00:00 · 2026-05-18 23:59:48 +00:00 · 2026-05-18 20:59:12 -03:00 · 2026-05-18 23:57:53 +00:00 · 2026-05-18 23:57:21 +00:00 · 2026-05-18 20:57:08 -03:00
2 changed files with 9 additions and 14 deletions
--- a/exemplos/MarcosAssuncao/teste.php
+++ b/exemplos/MarcosAssuncao/teste.php
@@ -0,0 +1,8 @@
+<H1>Título HTML</H1>
+<?php
+    if (1 > 2) {
+        echo "1 é maior do que 2";
+    } else {
+        echo "1 não é maior do que 2";
+    }
+?>
--- a/index.php
+++ b/index.php
@@ -1,14 +1 @@
-<html>
-<head></head>
-<!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-4DCQS3MFSC"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-4DCQS3MFSC');
-</script>
-<body>
-<?php echo "Testar evento de push com commit";?>
-</body>
+<?php echo "Teste de deploy nas branches develop e main";
Author	SHA1	Message	Date
Marcos Assunção	188284bdd1	Merge pull request 'develop' (#36 ) from develop into main Reviewed-on: #36	2026-05-19 00:00:02 +00: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	f86b68e4ed	Corrige ortografia	2026-05-18 20:59:12 -03:00
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	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	839a02fd6a	Testa Desploy em develop e main	2026-05-18 20:57:08 -03: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
Marcos Assunção	5f3cb7e176	Merge branch 'develop-marcos_assuncao' into develop	2026-05-18 20:54:52 -03:00
Marcos Assunção	05829c6a46	Realiza teste de deploy das branches develop e main	2026-05-18 20:50:40 -03: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	0e17a24c13	Cria arquivo de teste para demostração aos alunos da turma de 2024	2026-05-14 21:42:48 -03: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