diff options
Diffstat (limited to 'about.html')
-rw-r--r-- | about.html | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -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 & Ylenia Baldanza</h2> - <p lang="en">Translators</p> <p lang="de">Übersetzer</p> <p lang="fr">Traductrice</p> - <p lang="it">Traduttrici</p> </div> ->>>>>>> 70538e29b9e8925da767e258f707b6e90c368521 </div> <!--# include file="common/footer.inc" --> |