diff --git a/index.html b/index.html index f6a92de..6abd46f 100644 --- a/index.html +++ b/index.html @@ -10,11 +10,7 @@ -<<<<<<< HEAD - -======= - ->>>>>>> df74553af6e4272dcbbead09f94dfbe41b6f3079 +