diff --git a/public/index.html b/public/index.html index 44fc4aca..fd699b8d 100644 --- a/public/index.html +++ b/public/index.html @@ -2,4 +2,8 @@ document.write('') if(window.location.protocol == 'https:'){ document.write('') +<<<<<<< HEAD }