Rebase with master

AlexZaiats · AlexZaiats · commit 6aa503e40658 · 2019-11-08T12:26:32.000+02:00
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
@@ -1,10 +1,10 @@
+## 0.14.0+9
+
+* getIdToken use actual refresh value instead of checking if object exists
+
 ## 0.14.0+8
 
-<<<<<<< HEAD
 * Updated README instructions for contributing for consistency with other Flutterfire plugins.
-=======
-* getIdToken use actual refresh value instead of checking if object exists
->>>>>>> Rebase fixes
 
 ## 0.14.0+7
 
diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_auth
-version: 0.14.0+8
+version: 0.14.0+9
 
 flutter:
   plugin:
