Some merge bug fixed

ShahriarDhruvo · Nov 14, 2020 · 1927533 · 1927533
1 parent e67944c
commit 1927533
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 723 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -1,5 +1,4 @@
 import React from "react";
-import 'normalize.css';
 import "./styles/styles.scss";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { fas } from "@fortawesome/free-solid-svg-icons";

diff --git a/frontend/src/components/Dept/Dept.js b/frontend/src/components/Dept/Dept.js
@@ -3,6 +3,7 @@ import Container from "react-bootstrap/Container";
 import Card from "react-bootstrap/Card";
 import { CardColumns } from "react-bootstrap";
 import Button from "react-bootstrap/Button";
+import { Link } from "react-router-dom";
 const axios = require("axios");
 
 export default class Dept extends Component {

diff --git a/node_modules/normalize.css/CHANGELOG.md b/node_modules/normalize.css/CHANGELOG.md
diff --git a/node_modules/normalize.css/LICENSE.md b/node_modules/normalize.css/LICENSE.md
diff --git a/node_modules/normalize.css/README.md b/node_modules/normalize.css/README.md