diff --git a/public/index.html b/public/index.html index 999704e4..83ae0c35 100644 --- a/public/index.html +++ b/public/index.html @@ -2,8 +2,12 @@ document.write('') if(window.location.protocol == 'https:'){ document.write('') +<<<<<<< HEAD <<<<<<< HEAD }