ne02ptzero.me

my old website
Log | Files | Refs | LICENSE | git clone https://git.ne02ptzero.me/git/ne02ptzero.me

commit ded0be7cb97eba18594c397f0fa53332cf877d3a
parent ceeb0a581fc92ce9c284e14a9f27d3e9f4f162f1
Author: Louis Solofrizzo <ne02ptzero@debian>
Date:   Thu, 10 Jul 2014 21:24:21 +0200

Merge commit

Diffstat:
Mindex.html | 13++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html @@ -16,6 +16,7 @@ <title>Louis</title> </head> <body> +<<<<<<< HEAD <div id="home"> <h1>Hi !</h1> <i class='fa fa-chevron-down' onclick="moveto('#content')"></i> @@ -42,11 +43,21 @@ <br /> <a href="http://github.com/ne02ptzero/"><i class='fa fa-github'></i></a> <a href="http://facebook.com/ne02ptzero/"><i class='fa fa-facebook'></i></a> - <a href="http://twitter/ne02ptzero"><i class='fa fa-twitter'></i></a> + <a href="http://twitter.com/ne02ptzero"><i class='fa fa-twitter'></i></a> <a href="https://www.linkedin.com/profile/view?id=340936531"><i class='fa fa-linkedin'></i></a> <br /> <br /> <a class='mail-t' href="mailto:louis@ne02ptzero.me">louis@ne02ptzero.me</a> </div> +======= + <h1>Hello,</h1> + <p>My name is Louis Solofrizzo, and i am a developer.<br />See my work below !</p> + <a href="http://github.com/ne02ptzero/"><i class='fa fa-github'></i></a> + <a href="http://facebook.com/ne02ptzero/"><i class='fa fa-facebook'></i></a> + <a href="http://twitter.com/ne02ptzero"><i class='fa fa-twitter'></i></a> + <br /> + <br /> + <a class='mail-t' href="mailto:louis@ne02ptzero.me">louis@ne02ptzero.me</a> +>>>>>>> 3789d41c585d9d37ae60ab4c37e53dd5307e9e33 </body> </html>