fix merge

diff --git a/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
index 8afa69e..13f28e4 100644 (file)
--- a/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
@@ -94,11 +94,6 @@ namespace Xamarin.Forms.Platform.Android
                        ((IElementController)Element).SetValueFromRenderer(Entry.TextProperty, s.ToString());
                }
 
-               protected override FormsEditText CreateNativeControl()
-               {
-                       return new FormsEditText(Context);
-               }
-
                protected override void OnFocusChangeRequested(object sender, VisualElement.FocusRequestArgs e)
                {
                        if (!e.Focus)