From dc441169b5ea175eed5bfa43f634a39076a26dbc Mon Sep 17 00:00:00 2001
From: flubacheski <flubacheski@gmail.com>
Date: Wed, 20 Sep 2023 19:43:52 -0300
Subject: [PATCH] aula 09-array

---
 material/sobre.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/material/sobre.md b/material/sobre.md
index f746258c0..d4d9d31d3 100644
--- a/material/sobre.md
+++ b/material/sobre.md
@@ -3,7 +3,7 @@
 # Aulas
 
 * SEG 15:45 - 17:45 (Lab Ágil 2)
-* QUI 15:45 - 17:45 (Lab gil 2)
+* QUI 15:45 - 17:45 (Lab Ágil 2)
 
 * Atendimento: QUI 14:15 - 15:45 (Ágil 1)
 
@@ -20,10 +20,7 @@
 | 11/09 | 04-condicionais-funcoes | Github | 17/09 23h59 |
 | 14/09 | 05-loops | Github | 18/09 23h59 |
 | 18/09 | 06-variaveis-locais | Github | 22/09 23h59 |
-<<<<<<< HEAD
 | 21/09 | 07-arrays | Github | 24/09 23h59 |
-=======
->>>>>>> 2dd8bf7fcd0b617bfea429915c84a0ad9b7a85c9
 
 # Provas