Commit 477e56fd authored by seoyeon's avatar seoyeon
Browse files

merge

parent 3b2c3948
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment