fix-merge

Author: camillobruni

in-depth.html

@@ -139,18 +139,9 @@ <h3>
             </h3>
 
             <p>
-<<<<<<< HEAD
                 The <span style="color: var(--text-color-very-subtle);">greyed-out workloads</span> are not run by default but can be manually enabled on the command-line or via
                 the <code>?test=</code> URL parameter.
                 You can also click on the workload name to run that one individually, or on tags to run all workloads with a certain tag.
-||||||| 6588e89
-                The <span style="color: var(--text-color-very-subtle);">greyed-out workloads</span> are not run by default but can be manually enabled on the command-line or via
-                the <i>testList</i> URL parameter.
-=======
-                The <span style="color: var(--text-color-very-subtle);">greyed-out workloads</span> are not run by
-                default but can be manually enabled on the command-line or via
-                the <i>testList</i> URL parameter.
->>>>>>> main
             </p>
 
             <dl id="workload-details">
@@ -631,13 +622,6 @@ <h3>
                     Source code: <a href="web-tooling-benchmark/src/postcss.mjs">postcss.mjs</a>
                 </dd>
                 <dt id="prettier-wtb">prettier-wtb</dt>
-<<<<<<< HEAD
-                <dd>TODO</dd>
-                <dt id="prismjs-startup-es5">prismjs-startup-es5</dt>
-||||||| 6588e89
-                <dd>TODO</dd>
-                <dt id="prismjs-startup-es5" class="non-default">prismjs-startup-es5</dt>
-=======
                 <dd>
                     This benchmark runs the <a href="https://prettier.io/">Prettier</a> code formatter on various
                     JavaScript
@@ -647,7 +631,6 @@ <h3>
                     Source code: <a href="web-tooling-benchmark/src/prettier.mjs">prettier.mjs</a>
                 </dd>
                 <dt id="prismjs-startup-es5" class="non-default">prismjs-startup-es5</dt>
->>>>>>> main
                 <dt id="prismjs-startup-es6">prismjs-startup-es6</dt>
                 <dd>
                     These benchmarks measure the performance of the <a href="https://prismjs.com/">PrismJS</a> syntax
@@ -952,21 +935,13 @@ <h3>
                     A similar version of this benchmark was previously published in Octane version 2.
                     Source code: <a href="Octane/typescript.js">typescript.js</a>
                 </dd>
-<<<<<<< HEAD
-                <dt id="typescript-octane">typescript-octane</dt>
-                <dd>TODO</dd>
-||||||| 6588e89
-                <dt id="typescript-octane" class="non-default">typescript-octane</dt>
-                <dd>TODO</dd>
-=======
                 <dt id="typescript-octane" class="non-default">typescript-octane</dt>
                 <dd>
                     The original <a href="https://developers.google.com/octane/">Octane</a> version of the TypeScript
                     benchmark. It measures the time it takes the TypeScript compiler to compile a large input file,
                     stressing the performance of a large-scale JavaScript application with complex data structures.
                     Source code: <a href="Octane/typescript.js">typescript.js</a>
                 </dd>
->>>>>>> main
                 <dt id="UniPoker">UniPoker</dt>
                 <dd>
                     UniPoker is a 5 card stud poker simulation using the Unicode playing card code points,