diff --git a/public/index.html b/public/index.html index 6b8864c..811fdd3 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,11 @@ - +<<<<<<< HEAD + +======= + +>>>>>>> 257a00883537e6b7b623799b8b08a30e9bf56796