From 82d94bfaed3a30e5a783d6c4b8ab8fe83d6012ce Mon Sep 17 00:00:00 2001
From: Scytar <scytarnoob@gmail.com>
Date: Mon, 25 Apr 2022 15:52:14 -0300
Subject: [PATCH 1/2] =?UTF-8?q?Chore:=20Editado=20o=20par=C3=A1grafo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 432c030..d592fb8 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@ <h1>Página de teste para resolver conflitos</h1>
 
     <h2>Aqui que vão rolar os conflitos</h2>
     <p id="commit-here">
-        Escrevam qualquer coisa aqui e commitem.
+        Este conflito foi enviado pelo Bruno Adami
     </p>
 </body>
 </html>
\ No newline at end of file

From 2f67bdacc1c23dbb4c4551aa18d91d66b65b0f96 Mon Sep 17 00:00:00 2001
From: Scytar <scytarnoob@gmail.com>
Date: Mon, 25 Apr 2022 15:55:42 -0300
Subject: [PATCH 2/2] =?UTF-8?q?Editado=20o=20par=C3=A1grafo=20com=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index d592fb8..3406fbe 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@ <h1>Página de teste para resolver conflitos</h1>
 
     <h2>Aqui que vão rolar os conflitos</h2>
     <p id="commit-here">
-        Este conflito foi enviado pelo Bruno Adami
+        Este conflito foi enviado pelo Bruno Adami!!
     </p>
 </body>
 </html>
\ No newline at end of file