From a5343a6e8739ea1a0b616d8d646dd20e2cb51a7d Mon Sep 17 00:00:00 2001
From: AYM1607 <u.g.a.mariano@gmail.com>
Date: Tue, 26 Feb 2019 20:07:53 -0600
Subject: [PATCH] Added necessary dependencies for google sing in, created the
 google_sign_in provider, modified Info.plist to work with google sign in

---
 lib/src/resources/google_login_provider.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/src/resources/google_login_provider.dart b/lib/src/resources/google_login_provider.dart
index 0e3525f..eac75ae 100644
--- a/lib/src/resources/google_login_provider.dart
+++ b/lib/src/resources/google_login_provider.dart
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import 'dart:async';
 
 import 'package:firebase_auth/firebase_auth.dart';
@@ -26,3 +27,6 @@ class GoogleSignInProvider {
     return user;
   }
 }
+=======
+import 'package:firebase_auth/firebase_auth.dart';
+>>>>>>> Added necessary dependencies for google sing in, created the google_sign_in provider, modified Info.plist to work with google sign in