ne02ptzero.me

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

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

Fix merge conflict

Diffstat:
Mindex.html | 11-----------
1 file changed, 0 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html @@ -16,7 +16,6 @@ <title>Louis</title> </head> <body> -<<<<<<< HEAD <div id="home"> <h1>Hi !</h1> <i class='fa fa-chevron-down' onclick="moveto('#content')"></i> @@ -49,15 +48,5 @@ <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>