Merge main
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Jared He 2022-09-07 23:01:47 -04:00
parent e04ccbefc2
commit 7f64de74b7
1 changed files with 2 additions and 3 deletions

View File

@ -72,11 +72,11 @@ export default function Home() {
/> />
<h2> <h2>
<<<<<<< HEAD
<code>{"<Sections />"}</code> <code>{"<Sections />"}</code>
</h2> </h2>
<Sections data={sectionsData} /> <Sections data={sectionsData} />
=======
<h2>
<code>{"<BoxPlot />"}</code> <code>{"<BoxPlot />"}</code>
</h2> </h2>
<BoxPlot <BoxPlot
@ -101,7 +101,6 @@ export default function Home() {
circleDiameter={180} circleDiameter={180}
/> />
</div> </div>
>>>>>>> main
</div> </div>
); );
} }