diff --git a/public/index.html b/public/index.html index adb6be8a3..82bce8787 100644 --- a/public/index.html +++ b/public/index.html @@ -12,11 +12,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> a851764d4ddf6a6e9d18b8c70bc692e77556ab41