fix: merge conflict

notrab · notrab · commit 9206d92604d8 · 2022-01-11T11:24:48.000Z
diff --git a/gatsby-source-graphcms/src/gatsby-node.js b/gatsby-source-graphcms/src/gatsby-node.js
@@ -293,16 +293,13 @@ export async function createSchemaCustomization(gatsbyApi, pluginOptions) {
       type ${typePrefix}RichText {
         markdownNode: ${typePrefix}MarkdownNode @link
       }
-<<<<<<< HEAD
       ${richTextTypes.map(
         (typeName) => `
           type ${typePrefix}${typeName}RichText implements Node {
             markdownNode: ${typePrefix}MarkdownNode @link
           }
       `
       )}
-=======
->>>>>>> c28aac7 (feat: add support for Gatsby v4 (#206))
     `)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -293,16 +293,13 @@ export async function createSchemaCustomization(gatsbyApi, pluginOptions) {`
`293`	`293`	`type ${typePrefix}RichText {`
`294`	`294`	`markdownNode: ${typePrefix}MarkdownNode @link`
`295`	`295`	`}`
`296`		`-<<<<<<< HEAD`
`297`	`296`	`${richTextTypes.map(`
`298`	`297`	(typeName) => `
`299`	`298`	`type ${typePrefix}${typeName}RichText implements Node {`
`300`	`299`	`markdownNode: ${typePrefix}MarkdownNode @link`
`301`	`300`	`}`
`302`	`301`	`
`303`	`302`	`)}`
`304`		`-=======`
`305`		`->>>>>>> c28aac7 (feat: add support for Gatsby v4 (#206))`
`306`	`303`	`)
`307`	`304`	`}`
`308`	`305`