From 868a20d079087266cbd66961eb999441df9482eb Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Thu, 27 Feb 2020 11:37:24 -0600 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: Joe Haddad --- packages/next/lib/constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/next/lib/constants.ts b/packages/next/lib/constants.ts index ffad8c242c4a..e8025b25e9ec 100644 --- a/packages/next/lib/constants.ts +++ b/packages/next/lib/constants.ts @@ -26,8 +26,8 @@ export const PUBLIC_DIR_MIDDLEWARE_CONFLICT = `You can not have a '_next' folder export const SSG_GET_INITIAL_PROPS_CONFLICT = `You can not use getInitialProps with getStaticProps. To use SSG, please remove your getInitialProps` -export const SERVER_PROPS_GET_INIT_PROPS_CONFLICT = `You can not use getInitialProps with getServerSideProps. Please remove one or the other` +export const SERVER_PROPS_GET_INIT_PROPS_CONFLICT = `You can not use getInitialProps with getServerSideProps. Please remove getInitialProps.` -export const SERVER_PROPS_SSG_CONFLICT = `You can not use getStaticProps with getServerSideProps. To use SSG, please remove your getServerSideProps` +export const SERVER_PROPS_SSG_CONFLICT = `You can not use getStaticProps with getServerSideProps. To use SSG, please remove getServerSideProps` export const PAGES_404_GET_INITIAL_PROPS_ERROR = `\`pages/404\` can not have getInitialProps/getServerSideProps, https://err.sh/zeit/next.js/404-get-initial-props`