diff --git a/web/index.html b/web/index.html index 8d9574b10395..12d2c6c67782 100644 --- a/web/index.html +++ b/web/index.html @@ -22,11 +22,7 @@ <% if (htmlWebpackPlugin.options.isWeb && (htmlWebpackPlugin.options.isStaging || htmlWebpackPlugin.options.isProduction)) { %> -<<<<<<< HEAD - <% } %>