diff options
author | G.B <greta.brev@outlook.com> | 2015-03-22 22:40:57 +0100 |
---|---|---|
committer | G.B <greta.brev@outlook.com> | 2015-03-22 22:40:57 +0100 |
commit | 3ed3c9e7ab903cbfde7b528d67b92d06fbd9797d (patch) | |
tree | 3715313108b180b05923a7df3eaa5b730713bca7 /about.html | |
parent | 89de22c1858467ea2aea8fb4b55b844ca0430c7e (diff) | |
parent | 6651701dc4a2bacfbd8bdf4b17142eda04ecdfd7 (diff) | |
download | www-3ed3c9e7ab903cbfde7b528d67b92d06fbd9797d.tar.gz www-3ed3c9e7ab903cbfde7b528d67b92d06fbd9797d.zip |
final
Diffstat (limited to 'about.html')
-rw-r--r-- | about.html | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -83,10 +83,19 @@ | |||
83 | <p lang="it">Realizzando pensieri profondi</p> | 83 | <p lang="it">Realizzando pensieri profondi</p> |
84 | </div> | 84 | </div> |
85 | <div class="col-lg-4"> | 85 | <div class="col-lg-4"> |
86 | <<<<<<< HEAD | ||
86 | <h2>Greta Breveglieri & Ylenia Baldanza</h2> | 87 | <h2>Greta Breveglieri & Ylenia Baldanza</h2> |
87 | <p lang="en">Translators and best fan ever</p> | 88 | <p lang="en">Translators and best fan ever</p> |
88 | <p lang="it">Traduttrici e migliori fan mai avute</p> | 89 | <p lang="it">Traduttrici e migliori fan mai avute</p> |
89 | </div> | 90 | </div> |
91 | ======= | ||
92 | <h2>Greta Breveglieri & Ylenia Baldanza</h2> | ||
93 | <p lang="en">Translators</p> | ||
94 | <p lang="de">Übersetzer</p> | ||
95 | <p lang="fr">Traductrice</p> | ||
96 | <p lang="it">Traduttrici</p> | ||
97 | </div> | ||
98 | >>>>>>> 70538e29b9e8925da767e258f707b6e90c368521 | ||
90 | </div> | 99 | </div> |
91 | 100 | ||
92 | <!--# include file="common/footer.inc" --> | 101 | <!--# include file="common/footer.inc" --> |