Fixing after react update

client/src/components/profile/Profile.js

@@ -76,11 +76,19 @@ const Profile = ({ getProfileById, profile: { profile }, auth }) => {
     </section>
   );
 };
+<<<<<<< HEAD
+
+=======
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 Profile.propTypes = {
   getProfileById: PropTypes.func.isRequired,
   profile: PropTypes.object.isRequired,
   auth: PropTypes.object.isRequired
 };
+<<<<<<< HEAD
+
+=======
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 const mapStateToProps = (state) => ({
   profile: state.profile,
   auth: state.auth

client/src/components/profile/ProfileAbout.js

@@ -31,4 +31,8 @@ ProfileAbout.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-export default ProfileAbout;
+<<<<<<< HEAD
+export default ProfileAbout;
+=======
+export default ProfileAbout;
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/profile/ProfileEducation.js

@@ -26,4 +26,8 @@ ProfileEducation.propTypes = {
   education: PropTypes.object.isRequired
 };
 
-export default ProfileEducation;
+<<<<<<< HEAD
+export default ProfileEducation;
+=======
+export default ProfileEducation;
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/profile/ProfileExperience.js

@@ -26,4 +26,8 @@ ProfileExperience.propTypes = {
   experience: PropTypes.object.isRequired
 };
 
-export default ProfileExperience;
+<<<<<<< HEAD
+export default ProfileExperience;
+=======
+export default ProfileExperience;
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/profile/ProfileGithub.js

@@ -48,4 +48,8 @@ const mapStateToProps = state => ({
   repos: state.profile.repos
 });
 
-export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
+<<<<<<< HEAD
+export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
+=======
+export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/profile/ProfileTop.js

@@ -48,4 +48,8 @@ ProfileTop.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-export default ProfileTop;
+<<<<<<< HEAD
+export default ProfileTop;
+=======
+export default ProfileTop;
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb