From e1603383f9b3cf7c27399febe1ff21f40ff3903b Mon Sep 17 00:00:00 2001 From: Ahmed Ayad Date: Sun, 23 Aug 2020 14:08:13 +0300 Subject: [PATCH] Fixing firebase.js conflict --- src/api/firebase.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/api/firebase.js b/src/api/firebase.js index 2c8730a..0cd51a9 100644 --- a/src/api/firebase.js +++ b/src/api/firebase.js @@ -19,11 +19,8 @@ firebase.initializeApp(firebaseConfig); const db = firebase.firestore(); export const usersRef = db.collection('users'); export const routesRef = db.collection('routes'); -<<<<<<< HEAD -======= export const bussesRef = db.collection('busses'); ->>>>>>> 587027a976866e669f301489610df6c97220dad0 export const auth = firebase.auth(); if (!window.isJest) { auth.setPersistence(firebase.auth.Auth.Persistence.LOCAL);