Merge branch 'canary' into test/css-variables

vercel · Jan 9, 2020 · a88dc3e · a88dc3e
2 parents b361ae4 + 3497e7c
commit a88dc3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/basic-features/static-file-serving.md b/docs/basic-features/static-file-serving.md
@@ -18,4 +18,4 @@ export default MyImage
 
 > Don't name the `public` directory anything else. The name can't be changed and is the only directory that **Next.js** uses to serve static assets.
 
-> If you ever add a static asset that conflicts with the name of a `page`, the public file will be ignored in favor of the `page`.
+> If you ever add a static asset that conflicts with the name of a page in the `pages` directory, the public file will be ignored in favor of the file in `pages`.