Fixing after react update

2023-05-05 23:10:06 +03:00
parent 21fa38cc4d
commit d069e56397
45 changed files with 550 additions and 31 deletions
@@ -1,9 +1,16 @@
 import React, { useState } from 'react';
 import { connect } from 'react-redux';
+<<<<<<< HEAD
+import { Link, Navigate } from 'react-router-dom';
+import { setAlert } from '../../actions/alert';
+import { register } from '../../actions/auth';
+import PropTypes from 'prop-types';
+=======
 import PropTypes from 'prop-types';
 import { Link, Navigate } from 'react-router-dom';
 import { setAlert } from '../../actions/alert';
 import { register } from '../../actions/auth';
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

 const Register = ({ setAlert, register, isAuthenticated }) => {
  const [formData, setFormData] = useState({