fix: merge conflict

hygraph · Jan 11, 2022 · 9206d92 · 9206d92
1 parent e519f8f
commit 9206d92
Showing 1 changed file with 0 additions and 3 deletions.
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))
     `)
 }