Merge main

6 months ago · 7f64de74b7
parent e04ccbefc2
commit 7f64de74b7
1 changed files with 2 additions and 3 deletions
--- a/pages/playground.tsx
+++ b/pages/playground.tsx
@ -72,11 +72,11 @@ export default function Home() {
      />

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