data/mocks.ts

@@ -35,10 +35,6 @@ export const mockCategoricalData = [
     value: 29,
   },
 ];
-<<<<<<< HEAD
-=======
-
->>>>>>> main
 export const moreMockCategoricalData = [
   { key: "Python", value: 29.53 },
   { key: "Java", value: 17.06 },
@@ -67,7 +63,6 @@ export const moreMockCategoricalData = [
   { key: "Ada", value: 2.21 },
   { key: "Dart", value: 2.21 },
 ];
-<<<<<<< HEAD
 
 export const mockLineGraphlData = [
   {
@@ -95,5 +90,3 @@ export const mockLineGraphlData = [
     y: 80,
   },
 ];
-=======
->>>>>>> main

package.json

@@ -21,9 +21,9 @@
     "@visx/group": "^2.10.0",
     "@visx/scale": "^2.2.2",
     "@visx/shape": "^2.10.0",
+    "@visx/text": "^2.10.0",
     "@visx/tooltip": "^2.10.0",
     "@visx/wordcloud": "^2.10.0",
-    "@visx/text": "^2.10.0",
     "next": "12.1.6",
     "react": "18.1.0",
     "react-dom": "18.1.0"

pages/playground.tsx

@@ -3,10 +3,7 @@ import { mockCategoricalData, moreMockCategoricalData } from "data/mocks";
 import React from "react";
 
 import { ColorPalette } from "../components/ColorPalette";
-<<<<<<< HEAD
 import { LineGraph } from "../components/LineGraph";
-=======
->>>>>>> main
 import { WordCloud } from "../components/WordCloud";
 
 import styles from "./playground.module.css";
@@ -17,10 +14,6 @@ export default function Home() {
       <h1>Playground</h1>
       <p>Show off your components here!</p>
       <ColorPalette />
-<<<<<<< HEAD
-=======
-
->>>>>>> main
       <h2>
         <code>{"<BarGraphHorizontal />"}</code>
       </h2>
@@ -36,10 +29,6 @@ export default function Home() {
           right: 20,
         }}
       />
-<<<<<<< HEAD
-=======
-
->>>>>>> main
       <h2>
         <code>{"<BarGraphVertical />"}</code>
       </h2>
@@ -59,10 +48,6 @@ export default function Home() {
           right: 20,
         }}
       />
-<<<<<<< HEAD
-=======
-
->>>>>>> main
       <h2>
         <code>{"<WordCloud />"}</code>
       </h2>
@@ -72,24 +57,6 @@ export default function Home() {
           value: word.value,
         }))}
       />
-<<<<<<< HEAD
-      <h2>
-        <code>{"<LineGraph />"}</code>
-      </h2>
-      <LineGraph
-        // className={styles.barGraphDemo}
-        data={mockLineGraphlData}
-        width={700}
-        height={300}
-        margin={{
-          top: 20,
-          bottom: 40,
-          left: 50,
-          right: 20,
-        }}
-      />
-=======
->>>>>>> main
     </div>
   );
 }