Update Profile.js

2023-05-08 17:07:06 +00:00
parent cb88409727
commit 141eb0e96e
1 changed files with 0 additions and 7 deletions
@@ -76,19 +76,12 @@ 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