From 6dc7a5485e5fb819c8967085fe170e3de8bf03d3 Mon Sep 17 00:00:00 2001 From: Guillaume DE LA RUE Date: Sat, 12 Feb 2011 01:09:02 +0100 Subject: [PATCH] Some stupid comment --- index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/index.html b/index.html index 3b90a3f..351eaae 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD @@ -13,6 +12,3 @@ -======= -blbabnlazblk ->>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d