From 3dd9af2ae672fcf869618346bb6278e754a6955b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Mar 2015 15:46:54 +0100
Subject: merge

Former-commit-id: 755750f13cc04e29ad19b30cbcea85eef7b7849d
---
 about.html | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'about.html')

diff --git a/about.html b/about.html
index cc5f5d09..a74e180f 100644
--- a/about.html
+++ b/about.html
@@ -83,19 +83,12 @@
           <p lang="it">Realizzando pensieri profondi</p>
         </div>
         <div class="col-lg-4">
-<<<<<<< HEAD
           <h2>Greta Breveglieri & Ylenia Baldanza</h2>
           <p lang="en">Translators and best fan ever</p>
           <p lang="it">Traduttrici e migliori fan mai avute</p>
-        </div>  
-=======
-          <h2>Greta Breveglieri &amp; Ylenia Baldanza</h2>
-          <p lang="en">Translators</p>
           <p lang="de">&Uuml;bersetzer</p>
           <p lang="fr">Traductrice</p>
-          <p lang="it">Traduttrici</p>
         </div>
->>>>>>> 70538e29b9e8925da767e258f707b6e90c368521
       </div>
 
       <!--# include file="common/footer.inc" -->
-- 
cgit v1.2.3