diff --git a/index.html b/index.html index a94eb23..2309287 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,3 @@ -<<<<<<< HEAD - //something new @@ -34,16 +32,6 @@

ProjectX

-======= -
- - - - - - - - -
+