diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-03-24 15:46:54 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-03-24 15:46:54 +0100 |
commit | 3dd9af2ae672fcf869618346bb6278e754a6955b (patch) | |
tree | 08e49c6f376524a6ffa3fd2c90f7321d1bd98efe /about.html | |
parent | 58e7533af4c77817c592f7ba36578b72dca12b2b (diff) | |
download | www-3dd9af2ae672fcf869618346bb6278e754a6955b.tar.gz www-3dd9af2ae672fcf869618346bb6278e754a6955b.tar.bz2 www-3dd9af2ae672fcf869618346bb6278e754a6955b.zip |
merge
Former-commit-id: 755750f13cc04e29ad19b30cbcea85eef7b7849d
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" --> |