diff --git a/index.html b/index.html index df08e27..5383420 100644 --- a/index.html +++ b/index.html @@ -7,22 +7,7 @@
-<<<<<<< HEAD -<<<<<<< HEAD - -======= - -======= ->>>>>>> ad7461b31f7a7124db2b7a54220a75f537fb7163 - ->>>>>>> 2519ad3ded315d547331ca25e162de6126cb5018 @@ -1879,4 +1864,4 @@