Resolve conflito de exemplo (1)

PrivacidadeDigital · Jun 10, 2020 · 129a550 · 129a550
1 parent 900862d
commit 129a550
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pages/about.html b/pages/about.html
@@ -29,11 +29,7 @@
 
 <div class="row">
   <div class="col">
-<<<<<<< HEAD
     <h2>Time de Colaboradores Frequentes (Privacidade Digital)</h2>
-=======
-    <h2>Team Members</h2>
->>>>>>> upstream/master
   </div>
 </div>