Fix merge conflicts

Author: ReallySmallSoftware

README.md

@@ -319,14 +319,15 @@ In order to ensure the browser implementation works, it will be necessary to con
 ```
 
 # History
-## 1.0.1
+## 1.0.2
 - Update Firebase dependencies
 - Fix podspec for cordova-ios 5
-
-## 1.0.0
 - Major Android dependency update to 4.2.1
 - Breaking change around meaning of 'anonymous' configuration option
-- Add support for ANONYMOUS provider
+- Add support for ANONYMOUS provider (on Android)
+- Attempted to handle merging of anonymous users
+- Allowed iOS pods to use latest
+- Android logo disabled due to possible bug in FirebaseUI
 
 ## 0.0.10
 - Update JS Firebase dependencies

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebaseui-auth",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Adds support for Firebase UI authentication.",
   "repository": {
     "type": "git",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-firebaseui-auth" version="1.0.1">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-firebaseui-auth" version="1.0.2">
   <name>Firebase UI Authentication</name>
   <description>Adds support for Firebase Authentication to your Cordova/PhoneGap apps.</description>
   <license>Apache 2.0</license>

src/android/uk/co/reallysmall/cordova/plugin/firebase/ui/auth/FirebaseUIAuthPlugin.java

@@ -241,7 +241,7 @@ private AuthUI.SignInIntentBuilder buildCustomInstance() {
         try {
             if (options.has("logo")) {
                 int id = getIdentifier(options.getString("logo"), "drawable");
-            //    instance = instance.setLogo(id);
+              //  instance = instance.setLogo(id);
             }
             if (options.has("theme")) {
                 int id = getIdentifier(options.getString("theme"), "style");