merge

client/src/components/SignUp.js

@@ -42,18 +42,10 @@ const Signup = () => {
 
   async function handleSubmit() {
     try {
-<<<<<<< HEAD
-      const data = await userApi.signup(user)
-      // const data = await axios.post("https://localhost:8080/api/room/1/1",user)
-      setLoading(true);
-      setError("");
-      // const success = await login(user.email, user.password);
-=======
       const data = await axios.post("/api/room/1/1",user)
       // setLoading(true);
       // setError("");
       //   const success = await login(user.email, user.password);
->>>>>>> origin/master
       console.log(data);
       // sestSuccess(success);
     } catch (error) {