From 4a99dc209db266bf9d91f5548ac3252d55fca2e1 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:55:55 +0000
Subject: [PATCH] Update Dashboard.js

---
 client/src/components/dashboard/Dashboard.js | 25 ++------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/client/src/components/dashboard/Dashboard.js b/client/src/components/dashboard/Dashboard.js
index 0bd838d..6ac1033 100644
--- a/client/src/components/dashboard/Dashboard.js
+++ b/client/src/components/dashboard/Dashboard.js
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 import React, { useEffect } from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
@@ -7,26 +7,13 @@ import DashboardActions from './DashboardActions';
 import Experience from './Experience';
 import Education from './Education';
 import { getCurrentProfile, deleteAccount } from '../../actions/profile';
-=======
-import React, { useEffect } from "react";
-import { Link } from "react-router-dom";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import DashboardActions from "./DashboardActions";
-import Experience from "./Experience";
-import Education from "./Education";
-import { getCurrentProfile, deleteAccount } from "../../actions/profile";
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+
 
 const Dashboard = ({
   getCurrentProfile,
   deleteAccount,
   auth: { user },
-<<<<<<< HEAD
   profile: { profile }
-=======
-  profile: { profile },
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 }) => {
   useEffect(() => {
     getCurrentProfile();
@@ -66,20 +53,12 @@ Dashboard.propTypes = {
   getCurrentProfile: PropTypes.func.isRequired,
   deleteAccount: PropTypes.func.isRequired,
   auth: PropTypes.object.isRequired,
-<<<<<<< HEAD
-  profile: PropTypes.object.isRequired
-=======
   profile: PropTypes.object.isRequired,
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 };
 
 const mapStateToProps = (state) => ({
   auth: state.auth,
-<<<<<<< HEAD
-  profile: state.profile
-=======
   profile: state.profile,
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 });
 
 export default connect(mapStateToProps, { getCurrentProfile, deleteAccount })(