clean up merge conflict marker

ProjectEvergreen · Mar 26, 2021 · 0621247 · 0621247
1 parent 94209b2
commit 0621247
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/packages/cli/src/config/rollup.config.js b/packages/cli/src/config/rollup.config.js
@@ -289,7 +289,6 @@ function greenwoodHtmlPlugin(compilation) {
     // back to original <script> / <link> tags and update to their bundled filename in the HTML
     generateBundle(outputOptions, bundles) {      
       for (const bundleId of Object.keys(bundles)) {
-<<<<<<< HEAD
         try {
           const bundle = bundles[bundleId];