diff --git a/index.html b/index.html index 84054e4d5..baa3d96b5 100644 --- a/index.html +++ b/index.html @@ -42,7 +42,7 @@
@@ -382,14 +382,3 @@ - -<<<<<<< HEAD - - - -======= - ->>>>>>> 93cd62bcd8ad7480c55f15f5e20a36fcdbd7604a - - -