Solve merge conflict

vercel · May 1, 2022 · 3a5ab1e · 3a5ab1e
1 parent 7784d9c
commit 3a5ab1e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/next/shared/lib/page-path/normalize-page-path.ts b/packages/next/shared/lib/page-path/normalize-page-path.ts
@@ -1,6 +1,7 @@
 import { ensureLeadingSlash } from './ensure-leading-slash'
 import { isDynamicRoute } from '../router/utils'
 import { posix } from '../isomorphic/path'
+import { NormalizeError } from '../utils'
 
 /**
  * Takes a page and transforms it into its file counterpart ensuring that the
@@ -22,7 +23,7 @@ export function normalizePagePath(page: string): string {
 
   const resolvedPage = posix.normalize(normalized)
   if (resolvedPage !== normalized) {
-    throw new Error(
+    throw new NormalizeError(
       `Requested and resolved page mismatch: ${normalized} ${resolvedPage}`
     )
   }