Fixing after react update

client/src/components/dashboard/Dashboard.js

@@ -1,3 +1,13 @@
+<<<<<<< HEAD
+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';
+=======
 import React, { useEffect } from "react";
 import { Link } from "react-router-dom";
 import PropTypes from "prop-types";
@@ -6,12 +16,17 @@ 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();
@@ -51,12 +66,20 @@ 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 })(

client/src/components/dashboard/DashboardActions.js

@@ -17,4 +17,8 @@ const DashboardActions = () => {
   );
 };
 
-export default DashboardActions;
+<<<<<<< HEAD
+export default DashboardActions;
+=======
+export default DashboardActions;
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/dashboard/Education.js

@@ -46,4 +46,8 @@ Education.propTypes = {
   deleteEducation: PropTypes.func.isRequired
 };
 
-export default connect(null, { deleteEducation })(Education);
+<<<<<<< HEAD
+export default connect(null, { deleteEducation })(Education);
+=======
+export default connect(null, { deleteEducation })(Education);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/dashboard/Experience.js

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
+=======
 
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -47,4 +50,8 @@ Experience.propTypes = {
   deleteExperience: PropTypes.func.isRequired
 };
 
-export default connect(null, { deleteExperience })(Experience);
+<<<<<<< HEAD
+export default connect(null, { deleteExperience })(Experience);
+=======
+export default connect(null, { deleteExperience })(Experience);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb