From b6bd1f9abe6dd7012198e08666b9bce37a255e06 Mon Sep 17 00:00:00 2001 From: RawandDev Date: Thu, 14 Oct 2021 19:23:25 +0300 Subject: [PATCH 1/5] resolve(conflicts): resolve conflicts with deleting the book component --- src/App.js | 9 --------- src/components/TeamCard.jsx | 20 +++++++++++++++++++- src/pages/About.jsx | 27 ++++++++++++++++----------- src/service/about.json | 32 ++++++++++++++++++++++++++------ 4 files changed, 61 insertions(+), 27 deletions(-) diff --git a/src/App.js b/src/App.js index 03022b0..d50134a 100644 --- a/src/App.js +++ b/src/App.js @@ -21,7 +21,6 @@ import { PROFILE_ROUTE, } from "./routes"; import Footer from "./components/Footer"; -import BookCard from "./components/BookCard"; function App() { return ( @@ -38,14 +37,6 @@ function App() { - {/* to showcase the BookCard, Will be removed before merge */} -