Rebase fixes

AlexZaiats · AlexZaiats · commit 54b4c99fc5b0 · 2019-11-07T18:04:13.000+02:00
diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
@@ -1,10 +1,11 @@
+## 0.14.0+8
+
+* getIdToken use actual refresh value instead of checking if object exists
+
 ## 0.14.0+7
 
-<<<<<<< HEAD
 * Remove AndroidX warning.
-=======
-* Do not ignore "refresh" value for "getIdToken" on iOS
->>>>>>> getIdToken use actual refresh value instead of checking if object exists
+
 
 ## 0.14.0+6
 
