fixed merge errors

CS-UCR · Dec 5, 2019 · 2822bef · 2822bef
1 parent 590c38f
commit 2822bef
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/authentication/store/Action/auth.js b/src/authentication/store/Action/auth.js
@@ -68,11 +68,7 @@ export const login = (email, password) => {
 
       const accountData = await response.json()
       dispatch({ type: LOGIN, token: accountData.idToken, userId: accountData.localId });
-<<<<<<< HEAD
       firebase.auth().signInWithEmailAndPassword(email,password)
-=======
-      // console.log(firebase.auth().signInWithEmailAndPassword(email,password))
->>>>>>> origin/displayWorkspace
   }
 }