commments

src/pages/RegisterPages/Register/FirstPart/FirstPartOfRegistration.js

@@ -88,22 +88,17 @@ const FirstPartOfRegistration = (props) => {
           ),
         }}
       />
-<<<<<<< HEAD
-      {formik.errors.password && formik.touched.password ? (
-=======
+
 
       {formik.errors.mail && formik.touched.mail ? (
         <ErrorMessage>{formik.errors.mail}</ErrorMessage>
       ) : formik.errors.password && formik.touched.password ? (
->>>>>>> master
+
         <ErrorMessage>{formik.errors.password}</ErrorMessage>
       ) : (
         <></>
       )}
-<<<<<<< HEAD
-=======
-      
->>>>>>> master
+
       {props.error && <ErrorMessage>{props.errorMessage}</ErrorMessage>}
 
       <PrimaryButton