taler-www

commit 48b6656e2b805d3de5dae6bee53c3f083e6a6e37
parent 3ed3c9e7ab903cbfde7b528d67b92d06fbd9797d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 24 Mar 2015 15:46:54 +0100

merge

Diffstat:
M
about.html
 | 
7
-------

1 file changed, 0 insertions(+), 7 deletions(-)
diff --git 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" -->