fixed remaining merge conflict

jonaslagoni · Oct 25, 2023 · ef67d4c · ef67d4c
1 parent dd73f25
commit ef67d4c
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/modelina-website/scripts/build-examples.js b/modelina-website/scripts/build-examples.js
@@ -119,16 +119,10 @@ async function start() {
   mainReadme = mainReadme.replace('<!-- toc is generated with GitHub Actions do not remove toc markers -->', '');
   mainReadme = mainReadme.replace('<!-- toc -->', '');
   mainReadme = mainReadme.replace('<!-- tocstop -->', '');
-<<<<<<< Updated upstream
-  mainReadme = mainReadme.replace('- [integrate with React](?selectedExample=integrate-with-react/)', '- [integrate with React](https://github.com/asyncapi/modelina/tree/master/examples/integrate-with-react)');
-  mainReadme = mainReadme.replace('- [integrate with Next](?selectedExample=integrate-with-next/)', '- [integrate with Next](https://github.com/asyncapi/modelina/tree/master/examples/integrate-with-next)');
-  mainReadme = mainReadme.replace('- [TEMPLATE](?selectedExample=TEMPLATE)', '- [TEMPLATE](https://github.com/asyncapi/modelina/tree/master/examples/TEMPLATE)');
-=======
   mainReadme = mainReadme.replace('../docs/contributing.md', 'https://github.com/asyncapi/modelina/tree/master/examples/../docs/contributing.md');
   for (const exampleToIgnore of exampleToIgnore) {
     mainReadme = mainReadme.replace(`- [${exampleToIgnore}](?selectedExample=${exampleToIgnore}/)`, `- [${exampleToIgnore}](https://github.com/asyncapi/modelina/tree/master/examples/${exampleToIgnore})`);
   }
->>>>>>> Stashed changes
   const readmePath = path.resolve(__dirname, '../config/examples_readme.json');
   await writeFile(readmePath, JSON.stringify(mainReadme))
 }