fix conflict

JacobGeoGeek · Sep 23, 2020 · 8c015bb · 8c015bb
2 parents 0bcc9b6 + a810dd8
commit 8c015bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [codediodeio]
+custom: ['https://fireship.io/pro']
diff --git a/src/App.js b/src/App.js
@@ -10,7 +10,11 @@ import { useAuthState } from 'react-firebase-hooks/auth';
 import { useCollectionData } from 'react-firebase-hooks/firestore';
 
 firebase.initializeApp({
+<<<<<<< HEAD
   // your config
+=======
+ // your config
+>>>>>>> a810dd8a4bc0681e17c4ecd700aae5397404c0d5
 })
 
 const auth = firebase.auth();