resolve conflict

Author: sarahs

script/content-migrations/update-tocs.js

@@ -10,25 +10,18 @@ const getDocumentType = require('../../lib/get-document-type')
 const linkString = /{% [^}]*?link.*? (\/.*?) ?%}/m
 const linksArray = new RegExp(linkString.source, 'gm')
 
-<<<<<<< HEAD
-// the product order is determined by data/products.yml
-=======
 // The product order is determined by data/products.yml
->>>>>>> 088aaf648c7a1addec3d05bb8598c3be8297a5b6
 const productsFile = path.join(process.cwd(), 'data/products.yml')
 const productsYml = yaml.load(fs.readFileSync(productsFile, 'utf8'))
 const sortedProductIds = productsYml.productsInOrder.concat('/early-access')
 
-<<<<<<< HEAD
-=======
 // This script turns `{% link /<link> %} style content into children: [ -/<link> ] frontmatter arrays.
 //
 // It MUST be run after script/content-migrations/remove-map-topics.js.
 //
 // NOTE: The results won't work with the TOC handling currently in production, so the results must NOT
 // be committed until the updated handling is in place.
 
->>>>>>> 088aaf648c7a1addec3d05bb8598c3be8297a5b6
 walk(path.join(process.cwd(), 'content'), { includeBasePath: true, directories: false })
   .filter(file => file.endsWith('index.md'))
   .forEach(file => {
@@ -59,13 +52,9 @@ walk(path.join(process.cwd(), 'content'), { includeBasePath: true, directories:
       newContent = newContent.replace(linkItem, '').trim()
     })
 
-<<<<<<< HEAD
-    newContent = newContent.replace(/###? Table of Contents\n/i, '')
-=======
     newContent = newContent
       .replace(/###? Table of Contents\n/i, '')
       .replace(/<!-- {2}-->\n/g, '')
->>>>>>> 088aaf648c7a1addec3d05bb8598c3be8297a5b6
 
     // Fix this one weird file
     if (relativePath === 'discussions/guides/index.md') {