From 50f08a7536557833dbe935d55c5957305718c0fc Mon Sep 17 00:00:00 2001
From: victorraffaele <victorraffaele@gmail.com>
Date: Mon, 25 Apr 2022 15:53:03 -0300
Subject: [PATCH] testado conflito

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

diff --git a/index.html b/index.html
index 432c030..3deb0c5 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.
+        Testando conflitos!!
     </p>
 </body>
 </html>
\ No newline at end of file