Fix merge conflict

vercel · Feb 8, 2022 · 6b02148 · 6b02148
1 parent 9579d99
commit 6b02148
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -460,7 +460,6 @@ export async function renderToHTML(
     basePath,
     devOnlyCacheBusterQueryString,
     supportsDynamicHTML,
-    concurrentFeatures,
     images,
     reactRoot,
     runtime,